Skip to content

Commit

Permalink
ci: ubuntu-22.04
Browse files Browse the repository at this point in the history
Signed-off-by: The1111mp <[email protected]>
  • Loading branch information
1111mp committed Oct 13, 2024
1 parent 91efaa7 commit de4d587
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 25 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
38 changes: 17 additions & 21 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit de4d587

Please sign in to comment.