Skip to content

Commit 25acb23

Browse files
committed
test
1 parent 6903ee9 commit 25acb23

File tree

3 files changed

+21
-40
lines changed

3 files changed

+21
-40
lines changed

.github/workflows/ci-checks.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ concurrency:
88
group: ${{ github.workflow }}-${{ github.ref }}
99
cancel-in-progress: true
1010

11+
permissions: {}
12+
1113
jobs:
1214
sh-checker:
1315
runs-on: ubuntu-24.04-arm
14-
permissions:
15-
contents: read
1616
steps:
1717
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
with:
@@ -31,32 +31,18 @@ jobs:
3131
zizmor-checker:
3232
runs-on: ubuntu-24.04-arm
3333
permissions:
34-
contents: read
34+
security-events: write
3535
steps:
36-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
36+
- name: Checkout repository
37+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3738
with:
3839
persist-credentials: false
3940

40-
- name: Check GitHub Action workflows
41-
shell: bash {0}
42-
run: |
43-
pip install zizmor
44-
45-
zizmor="$(zizmor . --gh-token "${{ github.token }}")"
46-
exit_code="$?"
47-
48-
printf '%s\n' "$zizmor"
49-
50-
printf '%b\n' "\`\`\`" >> $GITHUB_STEP_SUMMARY
51-
printf '%s\n' "$zizmor" >> $GITHUB_STEP_SUMMARY
52-
printf '%b' "\`\`\`" >> $GITHUB_STEP_SUMMARY
53-
54-
exit "$exit_code"
41+
- name: Run zizmor 🌈
42+
uses: zizmorcore/zizmor-action@5ca5fc7a4779c5263a3ffa0e1f693009994446d1 # v0.1.2
5543

5644
editorconfig-checker:
5745
runs-on: ubuntu-24.04-arm
58-
permissions:
59-
contents: read
6046
steps:
6147
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6248
with:

.github/workflows/cmake-ninja-crossbuild.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ jobs:
3434
matrix:
3535
name: [cmake]
3636
os_id: [debian, ubuntu]
37-
os_codename: [bullseye, bookworm, focal, jammy, noble]
37+
os_codename: [bullseye, bookworm, trixie, jammy, noble]
3838
arch: [amd64, armhf, arm64]
3939
exclude:
40-
- os_id: debian
41-
os_codename: focal
4240
- os_id: debian
4341
os_codename: jammy
4442
- os_id: debian
@@ -47,6 +45,8 @@ jobs:
4745
os_codename: bullseye
4846
- os_id: ubuntu
4947
os_codename: bookworm
48+
- os_id: ubuntu
49+
os_codename: trixie
5050

5151
name: ${{ matrix.os_id }}:${{ matrix.os_codename }} ${{ matrix.name }} ${{ matrix.arch }}
5252

@@ -62,10 +62,10 @@ jobs:
6262
persist-credentials: false
6363

6464
- name: Host - Bootstrap qemu
65-
uses: userdocs/actions/qemu@main
65+
uses: userdocs/actions/qemu@e74d179578ddcf1cd07cd9eefd0915f33a3bd600 # v1.0.1
6666

6767
- name: Host - Create docker multiarch ${{ matrix.arch }} container
68-
run: docker run --name multiarch -it -d -v ${{ github.workspace }}:/home/github ghcr.io/userdocs/dcb:${{ matrix.os_id }}-${{ matrix.os_codename }}-${{ matrix.arch }}
68+
run: docker run --name multiarch -it -d -v ${{ github.workspace }}:/home/gh ghcr.io/userdocs/dcb:${{ matrix.os_id }}-${{ matrix.os_codename }}-${{ matrix.arch }}
6969

7070
- name: Host - cmake set cmake_github_tag
7171
run: printf '%s\n' "cmake_github_tag=$(git ls-remote -q -t --refs https://github.com/Kitware/CMake.git | awk '{sub("refs/tags/", "");sub("(.*)-rc(.*)", ""); print $2 }' | awk '!/^$/' | sort -rV | head -n 1)" >> $GITHUB_ENV
@@ -77,35 +77,35 @@ jobs:
7777
run: git clone --single-branch --branch ${cmake_github_tag} --shallow-submodules --recurse-submodules --depth 1 https://github.com/Kitware/CMake.git cmake
7878

7979
- name: Docker - Configure cmake
80-
run: docker exec -u github:github -w /home/github/cmake multiarch ./configure --parallel=$(nproc) --no-system-libs --enable-ccache --prefix=/home/github/build/${opt_dir_name}
80+
run: docker exec -u gh:gh -w /home/gh/cmake multiarch ./configure --parallel=$(nproc) --no-system-libs --enable-ccache --prefix=/home/gh/build/${opt_dir_name}
8181

8282
- name: Docker - Make build cmake
83-
run: docker exec -u github:github -w /home/github/cmake multiarch make -j $(nproc)
83+
run: docker exec -u gh:gh -w /home/gh/cmake multiarch make -j $(nproc)
8484

8585
- name: Docker - Make install cmake
86-
run: docker exec -u github:github -w /home/github/cmake multiarch make install
86+
run: docker exec -u gh:gh -w /home/gh/cmake multiarch make install
8787

8888
- name: Host - Git clone ninja
8989
run: git clone --single-branch --branch ${ninja_github_tag} --shallow-submodules --recurse-submodules --depth 1 https://github.com/ninja-build/ninja.git ninja
9090

9191
- name: Docker - Configure ninja
9292
run: >
93-
docker exec -u github:github -w /home/github/ninja multiarch /home/github/build/${opt_dir_name}/bin/cmake -B build
93+
docker exec -u gh:gh -w /home/gh/ninja multiarch "/home/gh/build/${opt_dir_name}/bin/cmake" -B build
9494
-D CMAKE_BUILD_TYPE="release"
9595
-D CMAKE_CXX_STANDARD="${cxx_standard}"
96-
-D CMAKE_INSTALL_PREFIX="/home/github/build/${opt_dir_name}"
96+
-D CMAKE_INSTALL_PREFIX="/home/gh/build/${opt_dir_name}"
9797
-D BUILD_TESTING=off
9898
9999
- name: Docker - Build ninja
100-
run: docker exec -u github:github -w /home/github/ninja multiarch /home/github/build/${opt_dir_name}/bin/cmake --build build -j"$(nproc)"
100+
run: docker exec -u gh:gh -w /home/gh/ninja multiarch "/home/gh/build/${opt_dir_name}/bin/cmake" --build build -j"$(nproc)"
101101

102102
- name: Docker - Install ninja
103-
run: docker exec -u github:github -w /home/github/ninja multiarch /home/github/build/${opt_dir_name}/bin/cmake --install build
103+
run: docker exec -u gh:gh -w /home/gh/ninja multiarch "/home/gh/build/${opt_dir_name}/bin/cmake" --install build
104104

105105
- name: Docker - Test cmake and ninja binaries and set versions
106106
run: |
107-
docker exec -u github:github -w /home/github multiarch bash -c '/home/github/build/${opt_dir_name}/bin/cmake --version 2> /dev/null | awk "NR==1{print \$3}" > cmake.version'
108-
docker exec -u github:github -w /home/github multiarch bash -c '/home/github/build/${opt_dir_name}/bin/ninja --version 2> /dev/null > ninja.version'
107+
docker exec -u gh:gh -w /home/gh multiarch bash -c '/home/gh/build/'"${opt_dir_name}"'/bin/cmake --version 2> /dev/null | awk "NR==1{print \$3}" > cmake.version'
108+
docker exec -u gh:gh -w /home/gh multiarch bash -c '/home/gh/build/'"${opt_dir_name}"'/bin/ninja --version 2> /dev/null > ninja.version'
109109
110110
- name: Host - Set cmake and ninja versions to variable
111111
id: version_info

zizmor.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)