ci: fixes

variar · Nov 24, 2024 · f5371d0 · f5371d0
1 parent 0ae4acb
commit f5371d0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml
@@ -4,17 +4,10 @@ runs:
   using: "composite"
   steps:
     - name: configure
-      if: ${{ matrix.config.os != 'oraclelinux' }}
       shell: sh
       run: |
         docker run --env KLOGG_VERSION=$KLOGG_VERSION --env KLOGG_BUILD_ROOT=$KLOGG_BUILD_ROOT --env KLOGG_CMAKE_OPTS="$KLOGG_CMAKE_OPTS" -v "$KLOGG_WORKSPACE":/usr/local ${{ matrix.config.container }} /bin/bash -c "cmake -B /usr/local/$KLOGG_BUILD_ROOT $KLOGG_CMAKE_OPTS -DCPM_SOURCE_CACHE=/usr/local/cpm_cache /usr/local"
 
-    - name: configure
-      if: ${{ matrix.config.os == 'oraclelinux' }}
-      shell: sh
-      run: |
-        docker run --env KLOGG_VERSION=$KLOGG_VERSION --env KLOGG_BUILD_ROOT=$KLOGG_BUILD_ROOT --env KLOGG_CMAKE_OPTS="$KLOGG_CMAKE_OPTS" -v "$KLOGG_WORKSPACE":/usr/local ${{ matrix.config.container }} scl enable gcc-toolset-12 bash -c "cmake -B /usr/local/$KLOGG_BUILD_ROOT $KLOGG_CMAKE_OPTS -DCPM_SOURCE_CACHE=/usr/local/cpm_cache /usr/local"
-
     - name: build
       shell: sh
       run: |

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -250,15 +250,6 @@ jobs:
           echo "SSL_DIR=${{ github.workspace }}\openssl-1.1\${{ matrix.config.arch }}\bin" >> $GITHUB_ENV
           echo "SSL_ARCH=${{ matrix.config.ssl_arch }}" >> $GITHUB_ENV 
 
-      - uses: ./.github/actions/agent-setup
-      - uses: ./.github/actions/klogg-version
-      - uses: ./.github/actions/prepare-workspace-env
-
-      - name: Prepare dev cmd
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: ${{ matrix.config.arch }}
-
       - name: Add pkg-config
         shell: sh
         run: |
@@ -267,11 +258,20 @@ jobs:
       - name: Add ragel
         shell: sh
         run: |
-          mkdir -p ${{ github.workspace }}/3rdparty/ragel
-          curl --progress-bar --location --output ${{ github.workspace }}/3rdparty/ragel/ragel.zip https://github.com/PolarGoose/Ragel-for-Windows/releases/download/ragel-6.10/Ragel.zip
-          cd ${{ github.workspace }}/3rdparty/ragel
+          mkdir -p ./3rdparty/ragel
+          curl --progress-bar --location --output ./3rdparty/ragel/ragel.zip https://github.com/PolarGoose/Ragel-for-Windows/releases/download/ragel-6.10/Ragel.zip
+          cd ./3rdparty/ragel
           7z x ragel.zip
 
+      - uses: ./.github/actions/agent-setup
+      - uses: ./.github/actions/klogg-version
+      - uses: ./.github/actions/prepare-workspace-env
+
+      - name: Prepare dev cmd
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.config.arch }}
+
       - uses: ./.github/actions/agent-build
       - uses: ./.github/actions/agent-run-tests
       - uses: ./.github/actions/agent-package-win

diff --git a/docker/oracle8/Dockerfile b/docker/oracle8/Dockerfile
@@ -19,5 +19,7 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2
 RUN wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip && \
     unzip ninja-linux.zip && chmod 755 ninja && mv ninja /opt/bin && rm ninja-linux.zip
 
+RUN echo "source /opt/rh/devtoolset-12/enable" >> ~/.bashrc
+
 ENV PATH=/opt/bin:$PATH