tTc

msune · Aug 30, 2024 · c87cd1e · c87cd1e
1 parent f0b9b40
commit c87cd1e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/.github/actions/build_containers/action.yaml b/.github/actions/build_containers/action.yaml
@@ -18,15 +18,16 @@ inputs:
     default: 1
 runs:
   using: "composite"
-  env:
-    COMMIT_ID: ${{ inputs.commit-id }}
-    DAEMONS: ${{ inputs.daemons }}
-    CI_NUM_WORKERS: ${{ inputs.ci_num_workers }}
-    CI_DEPS_DONT_CHECK_CERTIFICATE: ${{ inputs.ci_deps_dont_check_cert }}
   steps:
     - name: Build pmacct containers
+      env:
+        COMMIT_ID: ${{ inputs.commit-id }}
+        DAEMONS: ${{ inputs.daemons }}
+        CI_NUM_WORKERS: ${{ inputs.ci_num_workers }}
+        CI_DEPS_DONT_CHECK_CERTIFICATE: ${{ inputs.ci_deps_dont_check_cert }}
       shell: bash
       run: |
+        cd pmacct
         git config --global --add safe.directory $GITHUB_WORKSPACE
         git config --global --add safe.directory $GITHUB_WORKSPACE/src/external_libs/libcdada
         git rev-parse HEAD

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -126,14 +126,14 @@ jobs:
           cat ./pmacct/.github/actions/build_containers/action.yaml
 
       - name: Build containers
-        uses: ./.github/actions/build_containers/action.yaml
+        uses: ./pmacct/.github/actions/build_containers/
         with:
-          commit-id: ${GITHUB_SHA}
-          daemons: ${DAEMONS}
-          ci_num_workers: ${CI_NUM_WORKERS}
-          CI_DEPS_DONT_CHECK_CERTIFICATE: ${CI_DEPS_DONT_CHECK_CERTIFICATE}
+          commit-id: ${{GITHUB_SHA}}
+          daemons: ${{DAEMONS}}
+          ci_num_workers: ${{CI_NUM_WORKERS}}
+          ci_deps_dont_check_cert: ${{CI_DEPS_DONT_CHECK_CERTIFICATE}}
 
-      - name: Build containers
+      - name: Docker save images
         run: |
           echo "Saving images as artifacts..."
           mkdir -p /tmp/docker/

diff --git a/.github/workflows/regression_tests.yaml b/.github/workflows/regression_tests.yaml
@@ -169,12 +169,12 @@ jobs:
           trap - EXIT
 
       - name: Build containers
-        uses: ./.github/actions/build_containers/action.yaml
+        uses: ./pmacct/.github/actions/build_containers/
         with:
-          commit-id: ${GITHUB_SHA}
-          daemons: ${DAEMONS}
-          ci_num_workers: ${CI_NUM_WORKERS}
-          CI_DEPS_DONT_CHECK_CERTIFICATE: ${CI_DEPS_DONT_CHECK_CERTIFICATE}
+          commit-id: ${{GITHUB_SHA}}
+          daemons: ${{DAEMONS}}
+          ci_num_workers: ${{CI_NUM_WORKERS}}
+          ci_deps_dont_check_cert: ${{CI_DEPS_DONT_CHECK_CERTIFICATE}}
 
       - name: Download Artifacts
         if: ${{ success() && env.SKIP == 'false' }}