Skip to content

Commit

Permalink
CI optimization (#531)
Browse files Browse the repository at this point in the history
* portable was moved into extras and is unmaintained
* the CI tests for the portable rewrite are archived
  • Loading branch information
Narrat authored Aug 5, 2024
1 parent 45c4616 commit 75aafc0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ on:
push:
paths-ignore:
- 'doc/**'
- 'portable/**'
- 'extras/portable/**'
- '*.md'
branches:
- master
pull_request:
paths-ignore:
- 'doc/**'
- 'portable/**'
- 'extras/portable/**'
- '*.md'
branches:
- master
Expand All @@ -33,13 +33,13 @@ jobs:
sudo apt-get update -y -q
sudo apt-get install -y -q zsh cryptsetup gpg gawk libgcrypt20-dev steghide qrencode python2 python3-pip python3-dev libssl-dev make gcc sudo gettext bsdmainutils file pinentry-curses xxd libsodium23 libsodium-dev
- uses: actions/checkout@v3
- name: Build the KDF extras
- name: Build the pbkdf2 extras
run: |
make --directory=extras/kdf-keys
sudo make --directory=extras/kdf-keys install
- name: Run pbkdf2 tests
run: sudo make -C extras/kdf-keys test
- name: Disable swap
run: sudo swapoff -a
- name: Run main tests
run: sudo make test
- name: Run KDF tests
run: sudo make -C extras/kdf-keys test
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: ☠️ Portable tomb
on:
push:
paths:
- 'portable/**'
- 'extras/portable/**'
- '.github/workflows/portable.yml'
branches:
- master
pull_request:
paths:
- 'portable/**'
- 'extras/portable/**'
- '.github/workflows/portable.yml'
branches:
- master
Expand All @@ -30,11 +30,11 @@ jobs:
sudo apt-get install -q -y make openssl wget fuse3 util-linux
sudo make -C portable download-deps-ubuntu20
- name: Run portable tomb test
run: sudo make -C portable create-open-close
run: sudo make -C extras/portable create-open-close
- uses: actions/upload-artifact@v3
with:
name: ubuntu-test.tomb
path: portable/test.tomb*
path: extras/portable/test.tomb*
retention-days: 1

freebsd:
Expand All @@ -47,7 +47,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: ubuntu-test.tomb
path: portable
path: extras/portable
- name: Test in FreeBSD
id: test
uses: vmactions/freebsd-vm@v0
Expand All @@ -62,12 +62,12 @@ jobs:
chmod a+x /usr/bin/veracrypt /usr/bin/zenroom
kldload fusefs
run: |
sudo gmake -C portable
sudo gmake -C extras/portable
sudo gmake -C portable check-random-data
- uses: actions/upload-artifact@v3
with:
name: freebsd-test.tomb
path: portable/test.tomb*
path: extras/portable/test.tomb*
retention-days: 1

ubuntu-last-cleanup:
Expand All @@ -79,14 +79,14 @@ jobs:
- name: Install compiler and dependencies
run: |
sudo apt-get install -q -y make openssl wget fuse3 util-linux
sudo make -C portable download-deps-ubuntu20
sudo make -C extras/portable download-deps-ubuntu20
- name: Download tomb built on FreeBSD
uses: actions/download-artifact@v3
with:
name: freebsd-test.tomb
path: portable
path: extras/portable
- name: Check integrity FreeBSD->Ubuntu
run: sudo make -C portable check-random-data
run: sudo make -C extras/portable check-random-data
- name: delete FreeBSD tomb artifacts
uses: geekyeggo/delete-artifact@v2
with:
Expand Down

0 comments on commit 75aafc0

Please sign in to comment.