Skip to content

Commit

Permalink
Revert "Initial set up"
Browse files Browse the repository at this point in the history
This reverts commit 8a6b6e0.
  • Loading branch information
perubeanie committed Jan 29, 2024
1 parent 8a6b6e0 commit 4c10795
Show file tree
Hide file tree
Showing 214 changed files with 3,825 additions and 1,963 deletions.
162 changes: 119 additions & 43 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:

jobs:
check_update:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- name: install unifdef
run: |
Expand All @@ -42,7 +42,7 @@ jobs:
run: git diff --exit-code

check_docs:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: config
Expand All @@ -62,7 +62,7 @@ jobs:
# We are not as strict with libraries, but rather adapt to what's
# expected to be available in a certain version of each platform.
check-ansi:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: config
Expand All @@ -71,7 +71,7 @@ jobs:
run: make -s -j4

basic_gcc:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -91,7 +91,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

basic_clang:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -107,8 +107,27 @@ jobs:
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

self-hosted:
strategy:
matrix:
os: [freebsd-13.2, ubuntu-arm64-22.04]
runs-on: ${{ matrix.os }}-self-hosted
continue-on-error: true
steps:
- uses: actions/checkout@v4
- name: config
run: ./config enable-fips enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace
- name: config dump
run: ./configdata.pm --dump
- name: make
run: make -j4
- name: get cpu info
run: ./util/opensslwrap.sh version -c
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

minimal:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -125,7 +144,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

no-deprecated:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -141,11 +160,8 @@ jobs:
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

no-shared:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
runs-on: ${{matrix.os}}
no-shared-ubuntu:
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -155,12 +171,32 @@ jobs:
- name: make
run: make -s -j4
- name: get cpu info
run: ./util/opensslwrap.sh version -c
run: |
cat /proc/cpuinfo
./util/opensslwrap.sh version -c
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

no-shared-macos:
runs-on: macos-latest
if: github.server_url == 'https://github.com'
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
run: git submodule update --init --depth 1 fuzz/corpora
- name: config
run: ./config --banner=Configured --strict-warnings no-shared no-fips && perl configdata.pm --dump
- name: make
run: make -s -j4
- name: get cpu info
run: |
sysctl machdep.cpu
./util/opensslwrap.sh version -c
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

non-caching:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -177,7 +213,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0 TESTS="-test_fuzz* -test_ssl_* -test_sslapi -test_evp -test_cmp_http -test_verify -test_cms -test_store -test_enc -[01][0-9]"

address_ub_sanitizer:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -194,7 +230,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0

fuzz_tests:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -211,7 +247,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0 TESTS="test_fuzz*"

memory_sanitizer:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -229,7 +265,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0

threads_sanitizer:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -246,7 +282,7 @@ jobs:
run: make V=1 TESTS="test_threads test_internal_provider test_provfetch test_provider test_pbe test_evp_kdf test_pkcs12 test_store test_evp test_quic*" test HARNESS_JOBS=${HARNESS_JOBS:-4}

enable_non-default_options:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -265,7 +301,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

fips_and_ktls:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -284,7 +320,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

no-legacy:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -301,7 +337,7 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

legacy:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
- name: checkout fuzz/corpora submodule
Expand All @@ -317,27 +353,74 @@ jobs:
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}

out-of-source-and-install:
strategy:
matrix:
os: [ubuntu-latest, macos-latest ]
runs-on: ${{matrix.os}}
# out-of-source-and-install checks multiple things at the same time:
# - That building, testing and installing works from an out-of-source
# build tree
# - That building, testing and installing works with a read-only source
# tree
out-of-readonly-source-and-install-ubuntu:
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
with:
path: ./source
- name: checkout fuzz/corpora submodule
run: git submodule update --init --depth 1 fuzz/corpora
- name: extra preparations
working-directory: ./source
- name: make source read-only
run: chmod -R a-w ./source
- name: create build and install directories
run: |
mkdir ./build
mkdir ./install
- name: config
run: ../config --banner=Configured enable-fips enable-acvp-tests --strict-warnings --prefix=$(cd ../install; pwd) && perl configdata.pm --dump
run: |
../source/config --banner=Configured enable-fips enable-quic enable-acvp-tests --strict-warnings --prefix=$(cd ../install; pwd)
perl configdata.pm --dump
working-directory: ./build
- name: make
run: make -s -j4
working-directory: ./build
- name: get cpu info
run: ./util/opensslwrap.sh version -c
run: |
cat /proc/cpuinfo
./util/opensslwrap.sh version -c
working-directory: ./build
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
working-directory: ./build
- name: make install
run: make install
working-directory: ./build

out-of-readonly-source-and-install-macos:
runs-on: macos-latest
if: github.server_url == 'https://github.com'
steps:
- uses: actions/checkout@v4
with:
path: ./source
- name: checkout fuzz/corpora submodule
run: git submodule update --init --depth 1 fuzz/corpora
working-directory: ./source
- name: make source read-only
run: chmod -R a-w ./source
- name: create build and install directories
run: |
mkdir ./build
mkdir ./install
- name: config
run: |
../source/config --banner=Configured enable-fips enable-quic enable-acvp-tests --strict-warnings --prefix=$(cd ../install; pwd)
perl configdata.pm --dump
working-directory: ./build
- name: make
run: make -s -j4
working-directory: ./build
- name: get cpu info
run: |
sysctl machdep.cpu
./util/opensslwrap.sh version -c
working-directory: ./build
- name: make test
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
Expand All @@ -347,7 +430,7 @@ jobs:
working-directory: ./build

external-tests:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -380,7 +463,7 @@ jobs:
run: make test TESTS="test_external_oqsprovider"

external-test-pyca:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
strategy:
matrix:
RUST:
Expand All @@ -396,15 +479,12 @@ jobs:
- name: make
run: make -s -j4
- name: Setup Python
uses: actions/setup-python@v4.7.1
uses: actions/setup-python@v5.0.0
with:
python-version: ${{ matrix.PYTHON }}
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@master
with:
profile: minimal
toolchain: ${{ matrix.RUST }}
override: true
default: true
- name: get cpu info
run: |
cat /proc/cpuinfo
Expand All @@ -413,7 +493,7 @@ jobs:
run: make test TESTS="test_external_pyca" VERBOSE=1

external-test-cf-quiche:
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -422,11 +502,7 @@ jobs:
run: ./config --banner=Configured --strict-warnings enable-external-tests && perl configdata.pm --dump
- name: make
run: make -s -j4
- uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
default: true
- uses: dtolnay/rust-toolchain@stable
- name: get cpu info
run: |
cat /proc/cpuinfo
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/cross-compiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
tests: none
}
]
runs-on: ubuntu-latest
runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }}
steps:
- name: install package repository
if: matrix.platform.ppa != ''
Expand Down Expand Up @@ -183,15 +183,15 @@ jobs:
run: make -s -j4

- name: install qemu
if: github.event_name == 'push' && matrix.platform.tests != 'none'
if: matrix.platform.tests != 'none'
run: sudo apt-get -yq --force-yes install qemu-user

- name: Set QEMU environment
if: github.event_name == 'push' && matrix.platform.qemucpu != ''
if: matrix.platform.qemucpu != ''
run: echo "QEMU_CPU=${{ matrix.platform.qemucpu }}" >> $GITHUB_ENV

- name: Set OpenSSL caps environment
if: github.event_name == 'push' && matrix.platform.opensslcapsname != ''
if: matrix.platform.opensslcapsname != ''
run: echo "OPENSSL_${{ matrix.platform.opensslcapsname }}=\
${{ matrix.platform.opensslcaps }}" >> $GITHUB_ENV

Expand All @@ -210,3 +210,9 @@ jobs:
make test HARNESS_JOBS=${HARNESS_JOBS:-4} \
TESTS="${{ matrix.platform.tests }} -test_afalg" \
QEMU_LD_PREFIX=/usr/${{ matrix.platform.arch }}
- name: make evp tests
if: github.event_name == 'pull_request' && matrix.platform.tests != 'none'
run: |
make test HARNESS_JOBS=${HARNESS_JOBS:-4} \
TESTS="test_evp*" \
QEMU_LD_PREFIX=/usr/${{ matrix.platform.arch }}
2 changes: 1 addition & 1 deletion .github/workflows/fips-checksums.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: save PR number
run: echo ${{ github.event.number }} > ./artifact/pr_num
- name: save artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: fips_checksum
path: artifact/
Loading

0 comments on commit 4c10795

Please sign in to comment.