Githubactions: Update Linux OS's

Yubico · Dec 2, 2024 · eca1fed · eca1fed
1 parent 8b03831
commit eca1fed
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 26 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -8,16 +8,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - environment: "ubuntu:24.04"
+          - environment: "ubuntu:24.10"
             cc: "gcc"
             upload_for_test: "false"
-          - environment: "ubuntu:24.04"
+          - environment: "ubuntu:24.10"
             cc: "clang"
             upload_for_test: "false"
-          - environment: "ubuntu:23.10"
+          - environment: "ubuntu:24.04"
             cc: "gcc"
             upload_for_test: "false"
-          - environment: "ubuntu:23.10"
+          - environment: "ubuntu:24.04"
             cc: "clang"
             upload_for_test: "false"
           - environment: "ubuntu:22.04"
@@ -32,15 +32,6 @@ jobs:
           - environment: "ubuntu:20.04"
             cc: "clang"
             upload_for_test: "false"
-#          - environment: "ubuntu:18.04"
-#            cc: "gcc"
-#            upload_for_test: "false"
-#          - environment: "ubuntu:16.04"
-#            cc: "gcc"
-#            upload_for_test: "false"
-#          - environment: "ubuntu:14.04"
-#            cc: "gcc"
-#            upload_for_test: "false"
           - environment: "debian:12"
             cc: "gcc"
             upload_for_test: "false"
@@ -102,6 +93,15 @@ jobs:
           # append the following flags: -Wno-missing-braces -Wno-missing-field-initializers -Wno-implicit-function-declaration
           sed -i 's/-Wall -Wextra -Werror/-Wall -Wextra -Werror -Wno-missing-braces -Wno-missing-field-initializers -Wno-implicit-function-declaration/' cmake/SecurityFlags.cmake
 
+      - name: apply environment specific changes to CMakeLists.txt
+        working-directory: yubihsm-shell
+        if: ${{ matrix.environment == 'ubuntu:24.10' }}
+        run: |         
+          # ubuntu 24.10 comes with _FORTIFY_SOURCE already set
+          sed -i 's/add_definitions (-D_FORTIFY_SOURCE=2)/add_definitions (-D_FORTIFY_SOURCE=3)/' cmake/SecurityFlags.cmake
+          # Set PCSC flags
+          sed -i 's/#SET(CMAKE_C_FLAGS/SET(CMAKE_C_FLAGS/' ykhsmauth/CMakeLists.txt
+
       - name: do build
         working-directory: yubihsm-shell
         env:
@@ -172,10 +172,10 @@ jobs:
           - environment: "fedora:40"
             cc: "clang"
             upload_for_test: "false"
-          - environment: "fedora:39"
+          - environment: "fedora:41"
             cc: "gcc"
             upload_for_test: "false"
-          - environment: "fedora:39"
+          - environment: "fedora:41"
             cc: "clang"
             upload_for_test: "false"
 
@@ -224,6 +224,13 @@ jobs:
           # append the following flags: -Wno-missing-braces -Wno-missing-field-initializers -Wno-implicit-function-declaration
           sed -i 's/-Wall -Wextra -Werror/-Wall -Wextra -Werror -Wno-missing-braces -Wno-missing-field-initializers/' cmake/SecurityFlags.cmake
 
+      - name: apply environment specific changes to CMakeLists.txt
+        working-directory: yubihsm-shell
+        if: ${{ matrix.environment == 'fedora:41' }}
+        run: |
+          # Set PCSC flags
+          sed -i 's/#SET(CMAKE_C_FLAGS/SET(CMAKE_C_FLAGS/' ykhsmauth/CMakeLists.txt
+
       - name: do build
         working-directory: yubihsm-shell
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -143,13 +143,10 @@ jobs:
       fail-fast: false
       matrix:
         environment: [
+            "ubuntu:24.10",
             "ubuntu:24.04",
-            "ubuntu:23.10",
             "ubuntu:22.04",
             "ubuntu:20.04",
-#            "ubuntu:18.04",
-#            "ubuntu:16.04",
-#            "ubuntu:14.04",
             "debian:12",
             "debian:11",
         ]
@@ -211,10 +208,18 @@ jobs:
 
       - name: apply environment specific changes to CMakeLists.txt
         working-directory: yubihsm-shell
-        if: ${{ matrix.environment == 'ubuntu:24.04' }}
+        env:
+          DOCKER_IMAGE: ${{ matrix.environment }}
         run: |
-          # ubuntu 24.04 comes with _FORTIFY_SOURCE already set
-          sed -i 's/add_definitions (-D_FORTIFY_SOURCE=2)/add_definitions (-D_FORTIFY_SOURCE=3)/' cmake/SecurityFlags.cmake
+          if [ "$DOCKER_IMAGE" = "ubuntu:24.04" ] || [ "$DOCKER_IMAGE" = "ubuntu:24.10" ]; then
+            # ubuntu 24.04 and above come with _FORTIFY_SOURCE already set
+            sed -i 's/add_definitions (-D_FORTIFY_SOURCE=2)/add_definitions (-D_FORTIFY_SOURCE=3)/' cmake/SecurityFlags.cmake
+          fi
+          
+          if [ "$DOCKER_IMAGE" = "ubuntu:24.10" ]; then
+            # Set PCSC flags
+            sed -i 's/#SET(CMAKE_C_FLAGS/SET(CMAKE_C_FLAGS/' ykhsmauth/CMakeLists.txt
+          fi
 
       - name: extract platform name
         env:
@@ -288,8 +293,8 @@ jobs:
       fail-fast: false
       matrix:
         environment: [
-            "fedora:39",
             "fedora:40",
+            "fedora:41",
         ]
 
     name: build on ${{ matrix.environment }}
@@ -317,6 +322,13 @@ jobs:
           # append the following flags: -Wno-missing-braces -Wno-missing-field-initializers -Wno-implicit-function-declaration
           sed -i 's/-Wall -Wextra -Werror/-Wall -Wextra -Werror -Wno-missing-braces -Wno-missing-field-initializers/' cmake/SecurityFlags.cmake
 
+      - name: apply environment specific changes to ykhsmauth/CMakeLists.txt
+        working-directory: yubihsm-shell
+        if: ${{ matrix.environment == 'fedora:41' }}
+        run: |
+          # Set PCSC flags
+          sed -i 's/#SET(CMAKE_C_FLAGS/SET(CMAKE_C_FLAGS/' ykhsmauth/CMakeLists.txt
+
       - name: extract platform name
         env:
           DOCKER_IMAGE: ${{ matrix.environment }}

diff --git a/ykhsmauth/CMakeLists.txt b/ykhsmauth/CMakeLists.txt
@@ -24,9 +24,8 @@ if(WIN32)
     set(SOURCE ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 endif(WIN32)
 
-include_directories (
-  ${LIBPCSC_INCLUDEDIR}
-)
+include_directories (${LIBPCSC_INCLUDEDIR})
+#SET(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} ${LIBPCSC_CFLAGS}")
 
 add_library (ykhsmauth SHARED ${SOURCE})