diff options
author | Darren Tucker <dtucker@dtucker.net> | 2022-11-08 16:07:05 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2022-11-08 16:07:05 +1100 |
commit | 081134efb9e6848c477f5b1e6151c2870c3ed968 (patch) | |
tree | 01d16807c2bd63aaf298e05fc13078932a469857 | |
parent | 9a1b671c7af9fa85bf2f4269157cd5d92c40de43 (diff) |
Resync CI configs to HEAD.
There have been a number of fixes on the main branch, apply to V_9_1
branch.
-rwxr-xr-x | .github/configs | 16 | ||||
-rw-r--r-- | .github/workflows/c-cpp.yml | 15 | ||||
-rw-r--r-- | .github/workflows/selfhosted.yml | 11 | ||||
-rw-r--r-- | .github/workflows/upstream.yml | 6 |
4 files changed, 31 insertions, 17 deletions
diff --git a/.github/configs b/.github/configs index 6bf1ab27..d3171a83 100755 --- a/.github/configs +++ b/.github/configs @@ -12,7 +12,7 @@ config=$1 unset CC CFLAGS CPPFLAGS LDFLAGS LTESTS SUDO -TEST_TARGET="tests" +TEST_TARGET="tests compat-tests" LTESTS="" SKIP_LTESTS="" SUDO=sudo # run with sudo by default @@ -152,7 +152,7 @@ case "$config" in LIBCRYPTOFLAGS="--without-openssl" TEST_TARGET=t-exec ;; - valgrind-[1-4]|valgrind-unit) + valgrind-[1-5]|valgrind-unit) # rlimit sandbox and FORTIFY_SOURCE confuse Valgrind. CONFIGFLAGS="--without-sandbox --without-hardening" CONFIGFLAGS="$CONFIGFLAGS --with-cppflags=-D_FORTIFY_SOURCE=0" @@ -161,16 +161,17 @@ case "$config" in export TEST_SSH_ELAPSED_TIMES # Valgrind slows things down enough that the agent timeout test # won't reliably pass, and the unit tests run longer than allowed - # by github so split into three separate tests. - tests2="rekey integrity try-ciphers" + # by github so split into separate tests. + tests2="integrity try-ciphers" tests3="krl forward-control sshsig agent-restrict kextype sftp" tests4="cert-userkey cert-hostkey kextype sftp-perm keygen-comment percent" + tests5="rekey" case "$config" in valgrind-1) # All tests except agent-timeout (which is flaky under valgrind) # and hostbased (since valgrind won't let ssh exec keysign). # Slow ones are run separately to increase parallelism. - SKIP_LTESTS="agent-timeout hostbased ${tests2} ${tests3} ${tests4}" + SKIP_LTESTS="agent-timeout hostbased ${tests2} ${tests3} ${tests4} ${tests5}" ;; valgrind-2) LTESTS="${tests2}" @@ -181,6 +182,9 @@ case "$config" in valgrind-4) LTESTS="${tests4}" ;; + valgrind-5) + LTESTS="${tests5}" + ;; valgrind-unit) TEST_TARGET="unit USE_VALGRIND=1" ;; @@ -260,6 +264,8 @@ esac case "`./config.guess`" in *cygwin) SUDO="" + # Don't run compat tests on cygwin as they don't currently compile. + TEST_TARGET="tests" ;; *-darwin*) # Unless specified otherwise, build without OpenSSL on Mac OS since diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 3aaf729c..e1fbcdb8 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -2,9 +2,9 @@ name: C/C++ CI on: push: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', 'Makefile.in', 'configure.ac' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ] pull_request: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', 'Makefile.in', 'configure.ac' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ] jobs: ci: @@ -24,6 +24,7 @@ jobs: - { os: ubuntu-20.04, configs: valgrind-2 } - { os: ubuntu-20.04, configs: valgrind-3 } - { os: ubuntu-20.04, configs: valgrind-4 } + - { os: ubuntu-20.04, configs: valgrind-5 } - { os: ubuntu-20.04, configs: valgrind-unit } - { os: ubuntu-20.04, configs: c89 } - { os: ubuntu-20.04, configs: clang-6.0 } @@ -53,6 +54,7 @@ jobs: - { os: ubuntu-latest, configs: libressl-3.3.6 } - { os: ubuntu-latest, configs: libressl-3.4.3 } - { os: ubuntu-latest, configs: libressl-3.5.3 } + - { os: ubuntu-latest, configs: libressl-3.6.1 } - { os: ubuntu-latest, configs: openssl-master } - { os: ubuntu-latest, configs: openssl-noec } - { os: ubuntu-latest, configs: openssl-1.0.1 } @@ -62,9 +64,10 @@ jobs: - { os: ubuntu-latest, configs: openssl-1.1.1 } - { os: ubuntu-latest, configs: openssl-1.1.1k } - { os: ubuntu-latest, configs: openssl-1.1.1n } - - { os: ubuntu-latest, configs: openssl-1.1.1p } + - { os: ubuntu-latest, configs: openssl-1.1.1q } - { os: ubuntu-latest, configs: openssl-3.0.0 } - { os: ubuntu-latest, configs: openssl-3.0.5 } + - { os: ubuntu-latest, configs: openssl-3.0.7 } - { os: ubuntu-latest, configs: openssl-1.1.1_stable } # stable branch - { os: ubuntu-latest, configs: openssl-3.0 } # stable branch - { os: ubuntu-22.04, configs: pam } @@ -85,7 +88,7 @@ jobs: - name: install cygwin if: ${{ startsWith(matrix.os, 'windows') }} uses: cygwin/cygwin-install-action@master - - uses: actions/checkout@v2 + - uses: actions/checkout@main - name: setup CI system run: sh ./.github/setup_ci.sh ${{ matrix.configs }} - name: autoreconf @@ -93,7 +96,7 @@ jobs: - name: configure run: sh ./.github/configure.sh ${{ matrix.configs }} - name: save config - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: ${{ matrix.os }}-${{ matrix.configs }}-config path: config.h @@ -108,7 +111,7 @@ jobs: TEST_SSH_HOSTBASED_AUTH: yes - name: save logs if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: ${{ matrix.os }}-${{ matrix.configs }}-logs path: | diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml index 61b0b1e4..8044a2fb 100644 --- a/.github/workflows/selfhosted.yml +++ b/.github/workflows/selfhosted.yml @@ -2,12 +2,13 @@ name: C/C++ CI self-hosted on: push: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', 'Makefile.in', 'configure.ac' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ] jobs: selfhosted: if: github.repository == 'openssh/openssh-portable-selfhosted' runs-on: ${{ matrix.os }} + timeout-minutes: 600 env: TARGET_HOST: ${{ matrix.os }} strategy: @@ -73,7 +74,8 @@ jobs: steps: - name: shutdown VM if running run: vmshutdown - - uses: actions/checkout@v2 + working-directory: ${{ runner.temp }} + - uses: actions/checkout@main - name: autoreconf run: autoreconf - name: startup VM @@ -81,7 +83,7 @@ jobs: - name: configure run: vmrun ./.github/configure.sh ${{ matrix.configs }} - name: save config - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: ${{ matrix.os }}-${{ matrix.configs }}-config path: config.h @@ -94,7 +96,7 @@ jobs: timeout-minutes: 600 - name: save logs if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: ${{ matrix.os }}-${{ matrix.configs }}-logs path: | @@ -105,3 +107,4 @@ jobs: - name: shutdown VM if: always() run: vmshutdown + working-directory: ${{ runner.temp }} diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index 8a28468d..26233e43 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -17,9 +17,10 @@ jobs: os: [ obsdsnap, obsdsnap-i386 ] configs: [ default, without-openssl, ubsan ] steps: - - uses: actions/checkout@v2 - name: shutdown VM if running run: vmshutdown + working-directory: ${{ runner.temp }} + - uses: actions/checkout@main - name: startup VM run: vmstartup - name: update source @@ -37,7 +38,7 @@ jobs: timeout-minutes: 300 - name: save logs if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@main with: name: ${{ matrix.os }}-${{ matrix.configs }}-logs path: | @@ -45,3 +46,4 @@ jobs: - name: shutdown VM if: always() run: vmshutdown + working-directory: ${{ runner.temp }} |