Merge pull request #440 from eitsupi/update-script-tests

rocker-org · May 2, 2022 · a3289e3 · a3289e3
2 parents 4ca51b8 + 9c0448b
commit a3289e3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/scripts-test.yml b/.github/workflows/scripts-test.yml
@@ -30,16 +30,31 @@ jobs:
     needs: generate_matrix
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}}
     steps:
       - uses: actions/checkout@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+      - name: Prepare build
+        id: prep
+        run: |
+          test_name="${{ matrix.base_image }}-${{ matrix.tag }}-${{ matrix.script_name }}-${{ matrix.script_arg }}"
+          echo ::set-output name=output_tag::"${test_name/"/"/"-"}"
       - name: test build
         run: |
           docker buildx build . -f tests/rocker_scripts/Dockerfile \
           --output=type=docker \
+          --build-arg base_image=${{ matrix.base_image }} \
           --build-arg tag=${{ matrix.tag }} \
           --build-arg script_name=${{ matrix.script_name }} \
-          --build-arg script_arg=${{ matrix.script_arg }}
+          --build-arg script_arg=${{ matrix.script_arg }} \
+          --tag ${{ steps.prep.outputs.output_tag }}
+      - name: inspect image
+        run: |
+          make inspect-image/"${{ steps.prep.outputs.output_tag }}"
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: tmp
+          path: tmp
diff --git a/tests/rocker_scripts/Dockerfile b/tests/rocker_scripts/Dockerfile
@@ -1,5 +1,6 @@
-ARG tag=latest
-FROM rocker/r-ver:${tag}
+ARG base_image="rocker/r-ver"
+ARG tag="latest"
+FROM ${base_image}:${tag}
 
 COPY tests/rocker_scripts/test.sh /test.sh
 COPY scripts /rocker_scripts

diff --git a/tests/rocker_scripts/matrix.json b/tests/rocker_scripts/matrix.json
@@ -1,4 +1,7 @@
 {
+  "base_image": [
+    "rocker/r-ver"
+  ],
   "tag": [
     "4.0.0",
     "latest"
@@ -17,16 +20,19 @@
   ],
   "include": [
     {
+      "base_image": "rocker/r-ver",
       "tag": "4.0.0",
       "script_name": "install_rstudio.sh",
       "script_arg": "1.3.959"
     },
     {
+      "base_image": "rocker/r-ver",
       "tag": "latest",
       "script_name": "install_pandoc.sh",
       "script_arg": "2.18"
     },
     {
+      "base_image": "rocker/r-ver",
       "tag": "latest",
       "script_name": "install_quarto.sh",
       "script_arg": "0.9.260"