From 8a7b823a462fe68a0f269dc655bdf966c0aa0150 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 16 Apr 2025 11:06:05 +0200 Subject: [PATCH] switch cd to ubuntu 22.04 --- .github/workflows/cd.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ab0390d..a66f37b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -14,7 +14,7 @@ jobs: linux-ubuntu: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -47,14 +47,14 @@ jobs: - name: Compress artifacts shell: bash run: | - tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ . + tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ . - uses: actions/upload-artifact@v4 with: - name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64 + name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64 # TODO: do propper packing path: | - ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz + ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz android: timeout-minutes: 30 @@ -335,8 +335,8 @@ jobs: run: | mkdir ./artifacts/extract - echo $(unar -D -o ./artifacts/extract/ ./artifacts/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Linux-ubuntu20.04-x86_64/*) - dump_syms -s tomato-dev-ubuntu20.04-x86_64-sym ./artifacts/extract/tomato + echo $(unar -D -o ./artifacts/extract/ ./artifacts/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Linux-ubuntu22.04-x86_64/*) + dump_syms -s tomato-dev-ubuntu22.04-x86_64-sym ./artifacts/extract/tomato rm -rf ./artifacts/extract/* echo $(unar -D -o ./artifacts/extract/ ./artifacts/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Windows-msvc-x86_64/*) @@ -346,14 +346,14 @@ jobs: - name: Compress symbol stores shell: bash run: | - tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Linux-ubuntu20.04-x86_64-symbol_store.tar.gz -C ./tomato-dev-ubuntu20.04-x86_64-sym . + tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Linux-ubuntu22.04-x86_64-symbol_store.tar.gz -C ./tomato-dev-ubuntu22.04-x86_64-sym . tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Windows-msvc-x86_64-symbol_store.tar.gz -C ./tomato-dev-Windows-msvc-x86_64-sym . - uses: actions/upload-artifact@v4 with: name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-symbol_stores path: | - ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Linux-ubuntu20.04-x86_64-symbol_store.tar.gz + ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Linux-ubuntu22.04-x86_64-symbol_store.tar.gz ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-Windows-msvc-x86_64-symbol_store.tar.gz release: