Clean up

hebasto · Aug 11, 2023 · cc42f13 · cc42f13
1 parent 4c83b3f
commit cc42f13
Showing 1 changed file with 19 additions and 35 deletions.
diff --git a/.github/actions/run-in-docker-action/action.yml b/.github/actions/run-in-docker-action/action.yml
@@ -12,46 +12,30 @@ runs:
   using: "composite"
   steps:
     - run: |
-        echo '${{ toJSON(matrix.configuration.env_vars) }}'
-        echo '${{ toJSON(matrix.configuration.env_vars) }}' | jq -r 'to_entries | .[] | "\(.key)=\(.value)"'
-
         for var in "$(echo '${{ toJSON(matrix.configuration.env_vars) }}' | jq -r 'to_entries | .[] | "\(.key)=\(.value)"')"; do
           echo "$var" >> "$GITHUB_ENV"
         done
         echo "MAKEFLAGS=-j$(($(nproc) + 1))" >> "$GITHUB_ENV"
-        echo ................................................
-        cat "$GITHUB_ENV"
-
-      # read -r -a vars <<< "${{ matrix.configuration.env_vars }}"
-      # for var in "${vars[@]}"; do
-      #   echo "$var" >> "$GITHUB_ENV"
-      # done
-      # echo "MAKEFLAGS=-j$(($(nproc) + 1))" >> "$GITHUB_ENV"
       shell: bash
-      # run: |
-      #   for var in "$(echo '${{ inputs.matrix_env_vars }}' | jq -r 'to_entries | .[] | "\(.key)=\(.value)"')"; do
-      #     echo "$var" >> "$GITHUB_ENV"
-      #   done
-      #   echo "MAKEFLAGS=-j$(($(nproc) + 1))" >> "$GITHUB_ENV"
 
-    # - uses: docker/setup-buildx-action@v2
+    - uses: docker/setup-buildx-action@v2
 
-    # - uses: docker/build-push-action@v4
-    #   with:
-    #     context: .
-    #     file: ${{ inputs.dockerfile }}
-    #     tags: ${{ inputs.tag }}
-    #     push: false
-    #     load: true
-    #     cache-from: type=gha
+    - uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: ${{ inputs.dockerfile }}
+        tags: ${{ inputs.tag }}
+        push: false
+        load: true
+        cache-from: type=gha
 
-    # - shell: bash
-    #   run: >
-    #     docker run \
-    #       $(echo '${{ toJSON(env) }}' | jq -r 'keys[] | "-e \(.)"' | paste -sd " ") \
-    #       --volume ${{ github.workspace }}:${{ github.workspace }} \
-    #       --workdir ${{ github.workspace }} \
-    #       ${{ inputs.tag }} bash -c " \
-    #         git config --global --add safe.directory ${{ github.workspace }} && \
-    #         ./ci/cirrus.sh \
-    #       "
+    - run: >
+        docker run \
+          $(echo '${{ toJSON(env) }}' | jq -r 'keys[] | "-e \(.)"' | paste -sd " ") \
+          --volume ${{ github.workspace }}:${{ github.workspace }} \
+          --workdir ${{ github.workspace }} \
+          ${{ inputs.tag }} bash -c " \
+            git config --global --add safe.directory ${{ github.workspace }} && \
+            ./ci/cirrus.sh \
+          "
+      shell: bash