Runs tests on push (#317)

* Runs tests on push * Move out config
hendricius · Dec 19, 2023 · d0f71d9 · d0f71d9
1 parent 0fecb8e
commit d0f71d9
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/.github/workflows/test-book-website-pull-request.yml b/.github/workflows/test-book-website-pull-request.yml
@@ -0,0 +1,14 @@
+name: Test building book and website with custom image
+
+on:
+  pull_request:
+
+jobs:
+  build-and-push-image:
+    uses: ./.github/workflows/docker-build-push.yml
+
+  test-building-book-website:
+    needs: build-and-push-image
+    uses: ./.github/workflows/test-book-website.yml
+    with:
+      docker-image: ghcr.io/${{ github.repository }}:${{ github.event.pull_request.head.ref }}
diff --git a/.github/workflows/test-book-website-push.yml b/.github/workflows/test-book-website-push.yml
@@ -0,0 +1,14 @@
+name: Test building book and website with default image
+
+on:
+  push:
+
+jobs:
+  build-and-push-image:
+    uses: ./.github/workflows/docker-build-push.yml
+
+  test-building-book-website:
+    needs: build-and-push-image
+    uses: ./.github/workflows/test-book-website.yml
+    with:
+      docker-image: ghcr.io/${{ github.repository }}:latest
diff --git a/.github/workflows/test-book-website.yml b/.github/workflows/test-book-website.yml
@@ -1,41 +1,38 @@
-name: Test building book and website
+name: Test book and website for given image
 
 on:
-  pull_request:
-
-env:
-  IMAGE: ghcr.io/${{ github.repository }}:${{ github.event.pull_request.head.ref }}
+  workflow_call:
+    inputs:
+      docker-image:
+        required: true
+        type: string
 
 jobs:
-  build-and-push-image:
-    uses: ./.github/workflows/docker-build-push.yml
-
-  test-building-book-website:
-    needs: build-and-push-image
+  test-book-website:
     runs-on: ubuntu-latest
     steps:
       - name: Set up git repository
         uses: actions/checkout@v3
       - name: Print dependency versions
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ inputs.docker-image }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
             make show_tools_version
       - name: Print build variables
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ inputs.docker-image }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
             make printvars
       - name: Test baking the release versions
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ inputs.docker-image }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
@@ -51,7 +48,7 @@ jobs:
       - name: Test building website
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ inputs.docker-image }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book