diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 2655e65..be09c68 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -21,7 +21,7 @@ jobs: target: aarch64-apple-darwin - os: macos-15 target: x86_64-apple-darwin - - os: ubuntu-latest + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu runs-on: ${{ matrix.os }} @@ -42,7 +42,7 @@ jobs: cache-all-crates: true - name: Install dependencies (ubuntu only) - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf @@ -85,7 +85,7 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest + - os: ubuntu-22.04 target: aarch64-unknown-linux-gnu runs-on: ${{ matrix.os }} steps: @@ -283,7 +283,7 @@ jobs: update_alpha_notes: name: Update alpha notes - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [alpha, alpha-for-linux-arm64, alpha-for-fixed-webview2] steps: - name: Checkout repository diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2ce23a6..88595ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: target: aarch64-apple-darwin - os: macos-latest target: x86_64-apple-darwin - - os: ubuntu-latest + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu runs-on: ${{ matrix.os }} @@ -42,7 +42,7 @@ jobs: cache-all-crates: true - name: Install dependencies (ubuntu only) - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf @@ -81,7 +81,7 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest + - os: ubuntu-22.04 target: aarch64-unknown-linux-gnu runs-on: ${{ matrix.os }} steps: @@ -118,31 +118,30 @@ jobs: - name: 'Setup for linux' run: |- sudo ls -lR /etc/apt/ - echo ------------- - # sudo sed 's/mirror+file:\/etc\/apt\/apt-mirrors.txt/[arch-=amd64,i386] http:\/\/ports.ubuntu.com\/ubuntu-ports\//g' /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/ports.list - # echo ------------- - # sudo sed -i 's/mirror+file:\/etc\/apt\/apt-mirrors.txt/[arch=amd64,i386] http:\/\/archive.ubuntu.com\/ubuntu\//g' /etc/apt/sources.list + echo "-------------" + cat > /tmp/sources.list << EOF deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main multiverse universe restricted deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main multiverse universe restricted deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse universe restricted deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse universe restricted - deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy main multiverse universe restricted - deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy-security main multiverse universe restricted - deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy-updates main multiverse universe restricted - deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy-backports main multiverse universe restricted + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main multiverse universe restricted + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main multiverse universe restricted + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main multiverse universe restricted + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main multiverse universe restricted EOF + sudo mv /etc/apt/sources.list /etc/apt/sources.list.default sudo mv /tmp/sources.list /etc/apt/sources.list - echo ------------- + echo "-------------" echo /etc/apt/sources.list && cat /etc/apt/sources.list - echo ------------- + echo "-------------" echo /etc/apt/apt-mirrors.txt && cat /etc/apt/apt-mirrors.txt - echo ------------- + echo "-------------" echo /etc/apt/sources.list.d/ports.list && cat /etc/apt/sources.list.d/ports.list || true - echo ------------- + echo "-------------" sudo dpkg --add-architecture arm64 sudo apt update @@ -151,9 +150,6 @@ jobs: gcc-multilib \ g++-multilib - echo ------------- - echo install arm64 dependences ... - sudo apt install -y \ gcc-aarch64-linux-gnu \ g++-aarch64-linux-gnu \ @@ -274,7 +270,7 @@ jobs: files: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*setup* release-update: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [release, release-for-linux-arm64] steps: - name: Checkout repository @@ -299,7 +295,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} release-update-for-fixed-webview2: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [release-for-fixed-webview2] steps: - name: Checkout repository @@ -325,7 +321,7 @@ jobs: update_release_notes: name: Update release notes - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [release, release-for-linux-arm64, release-for-fixed-webview2] steps: - name: Checkout repository