Skip to content

Commit

Permalink
update various CI components
Browse files Browse the repository at this point in the history 
Update FreeBSD, actions/setup-python, actions/checkout,
actions/upload-artifact, cross-platform-actions/action.
  • Loading branch information
@guijan
guijan committed Dec 27, 2024
1 parent 5d38456 commit 8db5f49
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ task:
task:
freebsd_instance:
# Keep updated with newest release from https://www.freebsd.org/releases/
image: freebsd-13-1-release-amd64
image: freebsd-14-2-release-amd64-ufs
name: freebsd
setup_script:
- pkg install -y meson ninja gcc
Expand Down
41 changes: 21 additions & 20 deletions .github/workflows/build-and-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ jobs:
dietlibc:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v4.5.0
- uses: actions/setup-python@v5.3.0
- name: setup
run: |
pip install meson ninja
sudo apt update
sudo apt install -y dietlibc-dev valgrind linux-headers-generic
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.2.2
- name: build
run: |
CC='diet gcc' meson setup -Dtest_system=true \
Expand All @@ -59,7 +59,7 @@ jobs:
run: meson test --wrapper valgrind --no-suite system -C build
- name: test_system
run: meson test --wrapper valgrind --suite system -C build || true
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-dietlibc
Expand All @@ -72,7 +72,7 @@ jobs:
run: |
brew update
brew install meson samurai emscripten
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.2.2
- name: build
run: |
meson setup -Ddefault_library=static -Dtest_system=true \
Expand All @@ -82,7 +82,7 @@ jobs:
run: meson test --no-suite system -C build
- name: test_system
run: meson test --suite system -C build || true
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-emscripten
Expand All @@ -91,13 +91,13 @@ jobs:
glibc:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v4.5.0
- uses: actions/setup-python@v5.3.0
- name: setup
run: |
pip install meson ninja
sudo apt update
sudo apt install -y libasan6
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.2.2
- name: build
run: |
meson setup -Db_sanitize=address,undefined -Dtest_system=true build
Expand All @@ -106,7 +106,7 @@ jobs:
run: meson test --no-suite system -C build
- name: test_system
run: meson test --suite system -C build || true
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-glibc
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
if: always()
run: |
vmshell tar -cf - build/meson-logs | tar -xf -
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-haiku
Expand All @@ -151,7 +151,7 @@ jobs:
- run: |
brew update
brew install meson samurai
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.2.2
- name: build
run: |
meson setup -Db_sanitize=address,undefined -Dtest_system=true build
Expand All @@ -160,7 +160,7 @@ jobs:
run: meson test --no-suite system -C build
- name: test_system
run: meson test --suite system -C build || true
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-macos
Expand All @@ -181,7 +181,7 @@ jobs:
msystem: ${{matrix.sys}}
path-type: strict
pacboy: gcc:p meson:p ninja:p
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.2.2
- name: build
run: |
# LTO breaks msys (other environments seem to work):
Expand All @@ -193,7 +193,7 @@ jobs:
run: meson test --no-suite system -C build
- name: test_system
run: meson test --suite system -C build || true
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-${{matrix.sys}}
Expand All @@ -202,19 +202,20 @@ jobs:
netbsd:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.2.2
- name: test on NetBSD
uses: cross-platform-actions/action@v0.10.0
uses: cross-platform-actions/action@v0.26.0
with:
operating_system: netbsd
version: '9.2'
architecture: arm64
version: '10.0'
run: |
sudo pkgin -y install meson
meson setup -Dtest_system=true build
meson compile -C build
meson test --no-suite system -C build
meson test --suite system -C build || true
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-netbsd
Expand All @@ -226,9 +227,9 @@ jobs:
matrix:
cc: [cl, clang-cl]
steps:
- uses: actions/setup-python@v4.5.0
- uses: actions/setup-python@v5.3.0
- run: pip install meson ninja
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.2.2
- uses: ilammy/[email protected]
- name: build
run: |
Expand All @@ -243,7 +244,7 @@ jobs:
run: meson test --no-suite system -C build
- name: test_system
run: meson test --suite system -C build || true
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-vs-${{matrix.cc}}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
path-type: strict
pacboy: |
gcc:p meson:p ninja:p pkgconf:p groff: dos2unix:
- uses: actions/checkout@v3.3.0 # checkout libobsd
- uses: actions/checkout@v3.3.0 # checkout dictpw
- uses: actions/checkout@v4.2.2 # checkout libobsd
- uses: actions/checkout@v4.2.2 # checkout dictpw
with:
repository: guijan/dictpw
path: dictpw
Expand All @@ -48,7 +48,7 @@ jobs:
cd dictpw
meson setup build -Db_lto=false --wrap-mode=nofallback
meson compile -C build
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4.5.0
if: always()
with:
name: meson-logs-int-${{matrix.sys}}-${{matrix.link}}
Expand Down

0 comments on commit 8db5f49

Please sign in to comment.