Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created new centos & fedora workflow based on pre-built containers #2130

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Created new centos & fedora workflow based on pre-built containers #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 150 additions & 144 deletions .github/workflows/centos-and-fedora.yml
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions .github/workflows/debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,27 @@ jobs:
fail-fast: false
matrix:
image:
- { container: 'debian-11-i386', cpu: 'i386', arch: 'ia32', backend: 'botan' }
- { container: 'debian-11-i386', cpu: 'i386', arch: 'ia32', backend: 'openssl' }
- { container: 'debian-11-amd64', cpu: 'x86_64', arch: 'x64', backend: 'botan' }
- { container: 'debian-11-amd64', cpu: 'x86_64', arch: 'x64', backend: 'openssl' }
- { container: 'debian-10-i386', cpu: 'i386', arch: 'ia32', backend: 'botan' }
- { container: 'debian-11-i386', cpu: 'i386', backend: 'botan' }
- { container: 'debian-11-i386', cpu: 'i386', backend: 'openssl' }
- { container: 'debian-11-amd64', cpu: 'x86_64', backend: 'botan' }
- { container: 'debian-11-amd64', cpu: 'x86_64', backend: 'openssl' }
- { container: 'debian-10-i386', cpu: 'i386', backend: 'botan' }
env:
- { CC: 'gcc', CXX: 'g++' }
- { CC: 'clang', CXX: 'clang++' }

container: ghcr.io/rnpgp/ci-rnp-${{ matrix.image.container }}-${{ matrix.env.CC }}
container: ghcr.io/rnpgp/ci-rnp-${{ matrix.image.container }}

env: ${{ matrix.env }}
steps:
- name: Checkout on x86_x64
if: matrix.image.CPU == 'x86_64'
if: matrix.image.cpu == 'x86_64'
uses: actions/checkout@v3
with:
submodules: true

- name: Checkout on i386
if: matrix.image.CPU == 'i386'
if: matrix.image.cpu == 'i386'
uses: actions/checkout@v1
with:
submodules: true
Expand Down
11 changes: 0 additions & 11 deletions ci/docker/Makefile
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions ci/docker/fedora35.Dockerfile
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ci/docker/fedora35.test-locally
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ci/tests/ci-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ test_supported_features() {
fi

if [[ "$OSTYPE" == darwin* ]]; then
export DYLD_LIBRARY_PATH="$library_path"
export DYLD_LIBRARY_PATH="$library_path${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}"
else
export LD_LIBRARY_PATH="$library_path"
export LD_LIBRARY_PATH="$library_path${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
fi

"$RNP_INSTALL"/bin/rnp --version > rnp-version
Expand Down