libressl test 2

vszakats · Oct 10, 2023 · ba2f3fd · ba2f3fd
1 parent 4d2989a
commit ba2f3fd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
  - uses: actions/checkout@v3
  - name: 'build'
  run: |
- export CW_CONFIG='dev-linux'
+ export CW_CONFIG='dev-linux-libressl'
  export CW_REVISION='${{ github.sha }}'
  . ./_versions.sh
  docker trust inspect --pretty "${DOCKER_IMAGE}"
@@ -53,7 +53,7 @@ jobs:
  - uses: actions/checkout@v3
  - name: 'build'
  run: |
- export CW_CONFIG='dev-linux-musl'
+ export CW_CONFIG='dev-linux-musl-libressl'
  export CW_REVISION='${{ github.sha }}'
  . ./_versions.sh
  docker trust inspect --pretty "${DOCKER_IMAGE}"
@@ -110,7 +110,7 @@ jobs:
  - uses: actions/checkout@v3
  - name: 'build'
  run: |
- export CW_CONFIG='dev-linux-musl-libressl-noh3'
+ export CW_CONFIG='dev-linux-musl-libressl'
  export CW_REVISION='${{ github.sha }}'
  DOCKER_IMAGE='debian:bullseye'
  export CW_CCSUFFIX='-13'
@@ -139,7 +139,7 @@ jobs:
  - uses: actions/checkout@v3
  - name: 'build'
  run: |
- export CW_CONFIG='dev-linux'
+ export CW_CONFIG='dev-linux-libressl'
  export CW_REVISION='${{ github.sha }}'
  DOCKER_IMAGE='alpine:latest'
  docker trust inspect --pretty "${DOCKER_IMAGE}"
@@ -167,7 +167,7 @@ jobs:
  - uses: actions/checkout@v3
  - name: 'build'
  run: |
- export CW_CONFIG='dev-linux'
+ export CW_CONFIG='dev-linux-libressl'
  export CW_REVISION='${{ github.sha }}'
  sh -c ./_ci-mac-homebrew.sh
 
@@ -187,7 +187,7 @@ jobs:
  - uses: actions/checkout@v3
  - name: 'build'
  run: |
- export CW_CONFIG='dev-mac-macuni'
+ export CW_CONFIG='dev-mac-macuni-libressl'
  export CW_REVISION='${{ github.sha }}'
  sh -c ./_ci-mac-homebrew.sh
 
@@ -212,7 +212,7 @@ jobs:
  CW_LLVM_MINGW_DL: '1'
  CW_LLVM_MINGW_ONLY: '0'
  run: |
- export CW_CONFIG='dev-win'
+ export CW_CONFIG='dev-win-libressl'
  export CW_REVISION='${{ github.sha }}'
  . ./_versions.sh
  docker trust inspect --pretty "${DOCKER_IMAGE}"

diff --git a/_versions.sh b/_versions.sh
@@ -55,8 +55,8 @@ export BORINGSSL_VER_='d24a38200fef19150eef00cad35b138936c08767'
 export BORINGSSL_HASH=f00c18c6ceef32b50afb012b1a5c4faf38a470fb8e5c2deb9dbd45df1f0d7909
 export AWSLC_VER_='1.16.0'
 export AWSLC_HASH=8354ab96f0dc2fcb901db7933f54d0d8df627f748116ddfe0ccd90a06550cbed
-export LIBRESSL_VER_='3.7.3'
-export LIBRESSL_HASH=7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3
+export LIBRESSL_VER_='3.8.1'
+export LIBRESSL_HASH=c29bd6d9522746773cb9e4126d5a9a2c35ea5505f6fd49b679173f2b46e57372
 export ZLIBNG_VER_='2.1.3'
 export ZLIBNG_HASH=d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a
 export ZLIB_VER_='1.3'

diff --git a/libressl.sh b/libressl.sh
@@ -25,13 +25,13 @@ _VER="$1"
 
  [ "${LIBRESSL_VER_}" = '3.8.1' ] && options="${options} --disable-asm"
 
- if [ "${_CC}" = 'llvm' ]; then
- if [ "${_OS}" = 'win' ]; then
- CFLAGS="${CFLAGS} -Wno-inconsistent-dllimport"
- fi
- else
- CFLAGS="${CFLAGS} -Wno-attributes"
- fi
+# if [ "${_CC}" = 'llvm' ]; then
+# if [ "${_OS}" = 'win' ]; then
+# CFLAGS="${CFLAGS} -Wno-inconsistent-dllimport"
+# fi
+# else
+# CFLAGS="${CFLAGS} -Wno-attributes"
+# fi
 
  if [ "${_OS}" = 'mac' ] && [ "${_OSVER}" -lt '1100' ]; then
  # Workaround for mis-detecting 'strtonum' successfully despite targeting