remove matrix.build and fix dockerfile for copy ccip/config dir

smartcontractkit · Sep 16, 2024 · 86d0faf · 86d0faf
1 parent d7ea5ef
commit 86d0faf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/build-publish-develop-pr.yml b/.github/workflows/build-publish-develop-pr.yml
@@ -26,12 +26,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # '' is just core
-          - build: ''
-            image-name: chainlink
+          - image-name: chainlink
             goreleaser-config: .goreleaser.develop.yaml
-          - build: -ccip
-            image-name: ccip
+          - image-name: ccip
             goreleaser-config: .goreleaser.ccip.develop.yaml
     runs-on: ubuntu-20.04
     permissions:
@@ -55,18 +52,18 @@ jobs:
           echo "build-publish=false" | tee -a $GITHUB_OUTPUT
           if [[ ${{ github.event_name }} == 'push' ]]; then
             if [[ ${{ github.ref_name }} == 'release/'* ]]; then
-              echo "image-tag=release-${short_sha}${{ matrix.build }}" | tee -a $GITHUB_OUTPUT
+              echo "image-tag=release-${short_sha}" | tee -a $GITHUB_OUTPUT
               echo "build-publish=true" | tee -a $GITHUB_OUTPUT
             else
-              echo "image-tag=develop${{ matrix.build }}" | tee -a $GITHUB_OUTPUT
+              echo "image-tag=develop" | tee -a $GITHUB_OUTPUT
               echo "build-publish=true" | tee -a $GITHUB_OUTPUT
             fi
           elif [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
-            echo "image-tag=${short_sha}${{ matrix.build }}" | tee -a $GITHUB_OUTPUT
+            echo "image-tag=${short_sha}" | tee -a $GITHUB_OUTPUT
             echo "build-publish=${{ github.event.inputs.build-publish }}" | tee -a $GITHUB_OUTPUT
           else
             if [[ ${{ github.event_name }} == "pull_request" ]]; then
-              echo "image-tag=pr-${{ github.event.number }}-${short_sha}${{ matrix.build }}" | tee -a $GITHUB_OUTPUT
+              echo "image-tag=pr-${{ github.event.number }}-${short_sha}" | tee -a $GITHUB_OUTPUT
               if [[ ${{ contains(github.event.pull_request.labels.*.name, 'build-publish') }} == "true" ]]; then
                 echo "build-publish=true" | tee -a $GITHUB_OUTPUT
               fi

diff --git a/core/chainlink.goreleaser.Dockerfile b/core/chainlink.goreleaser.Dockerfile
@@ -39,7 +39,7 @@ RUN /usr/local/bin/ldd_fix
 RUN apt-get remove -y patchelf
 
 # CCIP specific
-COPY ./ccip/config /chainlink/ccip-config
+COPY ./ccip/config* /chainlink/ccip-config
 ARG CL_CHAIN_DEFAULTS
 ENV CL_CHAIN_DEFAULTS=${CL_CHAIN_DEFAULTS}