Skip to content

Commit de4d587

Browse files
committed
ci: ubuntu-22.04
Signed-off-by: The1111mp <[email protected]>
1 parent 91efaa7 commit de4d587

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

.github/workflows/pre-release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
target: aarch64-apple-darwin
2222
- os: macos-15
2323
target: x86_64-apple-darwin
24-
- os: ubuntu-latest
24+
- os: ubuntu-22.04
2525
target: x86_64-unknown-linux-gnu
2626

2727
runs-on: ${{ matrix.os }}
@@ -42,7 +42,7 @@ jobs:
4242
cache-all-crates: true
4343

4444
- name: Install dependencies (ubuntu only)
45-
if: matrix.os == 'ubuntu-latest'
45+
if: matrix.os == 'ubuntu-22.04'
4646
run: |
4747
sudo apt-get update
4848
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
@@ -85,7 +85,7 @@ jobs:
8585
fail-fast: false
8686
matrix:
8787
include:
88-
- os: ubuntu-latest
88+
- os: ubuntu-22.04
8989
target: aarch64-unknown-linux-gnu
9090
runs-on: ${{ matrix.os }}
9191
steps:
@@ -283,7 +283,7 @@ jobs:
283283

284284
update_alpha_notes:
285285
name: Update alpha notes
286-
runs-on: ubuntu-latest
286+
runs-on: ubuntu-22.04
287287
needs: [alpha, alpha-for-linux-arm64, alpha-for-fixed-webview2]
288288
steps:
289289
- name: Checkout repository

.github/workflows/release.yml

+17-21
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
target: aarch64-apple-darwin
2222
- os: macos-latest
2323
target: x86_64-apple-darwin
24-
- os: ubuntu-latest
24+
- os: ubuntu-22.04
2525
target: x86_64-unknown-linux-gnu
2626

2727
runs-on: ${{ matrix.os }}
@@ -42,7 +42,7 @@ jobs:
4242
cache-all-crates: true
4343

4444
- name: Install dependencies (ubuntu only)
45-
if: matrix.os == 'ubuntu-latest'
45+
if: matrix.os == 'ubuntu-22.04'
4646
run: |
4747
sudo apt-get update
4848
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
@@ -81,7 +81,7 @@ jobs:
8181
fail-fast: false
8282
matrix:
8383
include:
84-
- os: ubuntu-latest
84+
- os: ubuntu-22.04
8585
target: aarch64-unknown-linux-gnu
8686
runs-on: ${{ matrix.os }}
8787
steps:
@@ -118,31 +118,30 @@ jobs:
118118
- name: 'Setup for linux'
119119
run: |-
120120
sudo ls -lR /etc/apt/
121-
echo -------------
122-
# 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
123-
# echo -------------
124-
# sudo sed -i 's/mirror+file:\/etc\/apt\/apt-mirrors.txt/[arch=amd64,i386] http:\/\/archive.ubuntu.com\/ubuntu\//g' /etc/apt/sources.list
121+
echo "-------------"
122+
125123
cat > /tmp/sources.list << EOF
126124
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main multiverse universe restricted
127125
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main multiverse universe restricted
128126
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse universe restricted
129127
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse universe restricted
130128
131-
deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy main multiverse universe restricted
132-
deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy-security main multiverse universe restricted
133-
deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy-updates main multiverse universe restricted
134-
deb [arch-=amd64,i386] http://ports.ubuntu.com/ubuntu-ports jammy-backports main multiverse universe restricted
129+
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main multiverse universe restricted
130+
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main multiverse universe restricted
131+
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main multiverse universe restricted
132+
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main multiverse universe restricted
135133
EOF
134+
136135
sudo mv /etc/apt/sources.list /etc/apt/sources.list.default
137136
sudo mv /tmp/sources.list /etc/apt/sources.list
138137
139-
echo -------------
138+
echo "-------------"
140139
echo /etc/apt/sources.list && cat /etc/apt/sources.list
141-
echo -------------
140+
echo "-------------"
142141
echo /etc/apt/apt-mirrors.txt && cat /etc/apt/apt-mirrors.txt
143-
echo -------------
142+
echo "-------------"
144143
echo /etc/apt/sources.list.d/ports.list && cat /etc/apt/sources.list.d/ports.list || true
145-
echo -------------
144+
echo "-------------"
146145
147146
sudo dpkg --add-architecture arm64
148147
sudo apt update
@@ -151,9 +150,6 @@ jobs:
151150
gcc-multilib \
152151
g++-multilib
153152
154-
echo -------------
155-
echo install arm64 dependences ...
156-
157153
sudo apt install -y \
158154
gcc-aarch64-linux-gnu \
159155
g++-aarch64-linux-gnu \
@@ -274,7 +270,7 @@ jobs:
274270
files: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*setup*
275271

276272
release-update:
277-
runs-on: ubuntu-latest
273+
runs-on: ubuntu-22.04
278274
needs: [release, release-for-linux-arm64]
279275
steps:
280276
- name: Checkout repository
@@ -299,7 +295,7 @@ jobs:
299295
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
300296

301297
release-update-for-fixed-webview2:
302-
runs-on: ubuntu-latest
298+
runs-on: ubuntu-22.04
303299
needs: [release-for-fixed-webview2]
304300
steps:
305301
- name: Checkout repository
@@ -325,7 +321,7 @@ jobs:
325321

326322
update_release_notes:
327323
name: Update release notes
328-
runs-on: ubuntu-latest
324+
runs-on: ubuntu-22.04
329325
needs: [release, release-for-linux-arm64, release-for-fixed-webview2]
330326
steps:
331327
- name: Checkout repository

0 commit comments

Comments
 (0)