Skip to content

Commit 4cdc70a

Browse files
authored
Merge pull request #940 from openzim/few-workflow-fixes
Few workflow fixes
2 parents 40bfe64 + 0edd859 commit 4cdc70a

File tree

2 files changed

+47
-61
lines changed

2 files changed

+47
-61
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ jobs:
4141

4242
steps:
4343
- name: Harden Runner
44-
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
44+
uses: step-security/harden-runner@v2
4545
with:
4646
egress-policy: audit
4747

4848
- name: Checkout code
49-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
49+
uses: actions/checkout@v4
5050

5151
- name: Setup Python 3.10
52-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
52+
uses: actions/setup-python@v5
5353
with:
5454
python-version: '3.10'
5555

5656
- name: Install packages
5757
run: |
5858
brew update
59-
brew install gcovr pkg-config ninja || brew link --overwrite python
59+
brew install gcovr ninja || brew link --overwrite python
6060
6161
- name: Install Python modules
6262
run: pip3 install meson pytest
@@ -102,15 +102,15 @@ jobs:
102102

103103
steps:
104104
- name: Harden Runner
105-
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
105+
uses: step-security/harden-runner@v2
106106
with:
107107
egress-policy: audit
108108

109109
- name: Checkout code
110-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
110+
uses: actions/checkout@v4
111111

112112
- name: Setup python 3.10
113-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
113+
uses: actions/setup-python@v5
114114
with:
115115
python-version: '3.10'
116116

@@ -160,8 +160,6 @@ jobs:
160160
- linux-aarch64-dyn
161161
- android-arm
162162
- android-arm64
163-
- win32-static
164-
- win32-dyn
165163
- wasm
166164
with_xapian:
167165
- true
@@ -203,18 +201,6 @@ jobs:
203201
arch_name: aarch64-linux-android
204202
run_test: false
205203
coverage: false
206-
- target: win32-static
207-
image_variant: f35
208-
lib_postfix: '64'
209-
arch_name: i686-w64-mingw32
210-
run_test: false
211-
coverage: false
212-
- target: win32-dyn
213-
image_variant: f35
214-
lib_postfix: '64'
215-
arch_name: i686-w64-mingw32
216-
run_test: false
217-
coverage: false
218204
- target: wasm
219205
image_variant: focal
220206
lib_postfix: '/x86_64-linux-gnu'
@@ -229,7 +215,7 @@ jobs:
229215

230216
steps:
231217
- name: Harden Runner
232-
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
218+
uses: step-security/harden-runner@v2
233219
with:
234220
egress-policy: audit
235221

@@ -240,7 +226,7 @@ jobs:
240226
target_platform: ${{ matrix.target }}
241227

242228
- name: Retrieve source code
243-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
229+
uses: actions/checkout@v4
244230

245231
- name: Compile source code
246232
shell: bash
@@ -310,12 +296,12 @@ jobs:
310296

311297
steps:
312298
- name: Harden Runner
313-
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
299+
uses: step-security/harden-runner@v2
314300
with:
315301
egress-policy: audit
316302

317303
- name: "Checkout code"
318-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
304+
uses: actions/checkout@v4
319305
with:
320306
persist-credentials: false
321307

.github/workflows/package.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
distro:
18-
- debian-unstable
19-
- debian-trixie
20-
- debian-bookworm
21-
- debian-bullseye
18+
# - debian-unstable
19+
# - debian-trixie
20+
# - debian-bookworm
21+
# - debian-bullseye
2222
- ubuntu-noble
2323
- ubuntu-jammy
2424
- ubuntu-focal
2525

2626
# Pin your dependencies with https://github.com/mheap/pin-github-action
2727
steps:
2828
- name: Harden Runner
29-
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # pin@v2
29+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # pin@v2
3030
with:
3131
egress-policy: audit
3232

33-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
33+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4
3434

3535
# Determine which PPA we should upload to
3636
- name: PPA
3737
id: ppa
3838
run: |
3939
if [[ $REF == refs/tags* ]]
4040
then
41-
echo "::set-output name=ppa::kiwixteam/release"
41+
echo "ppa=kiwixteam/release" >> $GITHUB_OUTPUT
4242
else
43-
echo "::set-output name=ppa::kiwixteam/dev"
43+
echo "ppa=kiwixteam/dev" >> $GITHUB_OUTPUT
4444
fi
4545
env:
4646
REF: ${{ github.ref }}
@@ -51,33 +51,33 @@ jobs:
5151
5252
distro: ${{ matrix.distro }}
5353

54-
- uses: legoktm/gh-action-build-deb@7a6b22239275ae4e425fefc6f1aeb1118160500d # pin@debian-unstable
55-
if: matrix.distro == 'debian-unstable'
56-
name: Build package for debian-unstable
57-
id: build-debian-unstable
58-
with:
59-
args: --no-sign
60-
61-
- uses: legoktm/gh-action-build-deb@b47978ba8498dc8b8153cc3b5f99a5fc1afa5de1 # pin@debian-trixie
62-
if: matrix.distro == 'debian-trixie'
63-
name: Build package for debian-trixie
64-
id: build-debian-trixie
65-
with:
66-
args: --no-sign
67-
68-
- uses: legoktm/gh-action-build-deb@1f4e86a6bb34aaad388167eaf5eb85d553935336 # pin@debian-bookworm
69-
if: matrix.distro == 'debian-bookworm'
70-
name: Build package for debian-bookworm
71-
id: build-debian-bookworm
72-
with:
73-
args: --no-sign
74-
75-
- uses: legoktm/gh-action-build-deb@084b4263209252ec80a75d2c78a586192c17f18d # pin@debian-bullseye
76-
if: matrix.distro == 'debian-bullseye'
77-
name: Build package for debian-bullseye
78-
id: build-debian-bullseye
79-
with:
80-
args: --no-sign
54+
# - uses: legoktm/gh-action-build-deb@7a6b22239275ae4e425fefc6f1aeb1118160500d # pin@debian-unstable
55+
# if: matrix.distro == 'debian-unstable'
56+
# name: Build package for debian-unstable
57+
# id: build-debian-unstable
58+
# with:
59+
# args: --no-sign
60+
61+
# - uses: legoktm/gh-action-build-deb@b47978ba8498dc8b8153cc3b5f99a5fc1afa5de1 # pin@debian-trixie
62+
# if: matrix.distro == 'debian-trixie'
63+
# name: Build package for debian-trixie
64+
# id: build-debian-trixie
65+
# with:
66+
# args: --no-sign
67+
68+
# - uses: legoktm/gh-action-build-deb@1f4e86a6bb34aaad388167eaf5eb85d553935336 # pin@debian-bookworm
69+
# if: matrix.distro == 'debian-bookworm'
70+
# name: Build package for debian-bookworm
71+
# id: build-debian-bookworm
72+
# with:
73+
# args: --no-sign
74+
75+
# - uses: legoktm/gh-action-build-deb@084b4263209252ec80a75d2c78a586192c17f18d # pin@debian-bullseye
76+
# if: matrix.distro == 'debian-bullseye'
77+
# name: Build package for debian-bullseye
78+
# id: build-debian-bullseye
79+
# with:
80+
# args: --no-sign
8181

8282
- uses: legoktm/gh-action-build-deb@9114a536498b65c40b932209b9833aa942bf108d # pin@ubuntu-noble
8383
if: matrix.distro == 'ubuntu-noble'
@@ -101,7 +101,7 @@ jobs:
101101
args: --no-sign
102102
ppa: ${{ steps.ppa.outputs.ppa }}
103103

104-
- uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # pin@v4
104+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # pin@v4
105105
with:
106106
name: Packages for ${{ matrix.distro }}
107107
path: output

0 commit comments

Comments
 (0)