Merge pull request #11 from hathitrust/action-updates

Action updates

.github/workflows/build.yaml

@@ -1,46 +1,51 @@
-name: Build A Branch
+name: Build
 
 on:
-  workflow_run:
-    workflows: ['Run Tests']
-    branches: ['main']
-    types: [completed]
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: Release or Tag
-        required: true
-      push_latest:
-        description: Set True if the build is for the latest version
-        type: boolean
-        required: false
-        default: false
+    workflow_run:
+        workflows: ['Run Tests']
+        branches: ['main']
+        types: [completed]
 
-jobs:
-  build-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+    workflow_dispatch:
+        inputs:
+            img_tag:
+                description: Docker Image Tag
+            ref:
+                description: Revision or Branch to build
+                default: main
+            push_latest:
+                description: Set True if the build is for the latest version
+                type: boolean
+                required: false
+                default: false
+            platforms:
+                description: Platforms to build for
+                type: choice
+                default: linux/amd64,linux/arm64
+                options:
+                - linux/amd64,linux/arm64
+                - linux/amd64
+                - linux/arm64
+            rebuild:
+                description: Rebuild this image?
+                type: boolean
+                default: false
 
-    steps:
-      - name: Set Inputs
-        id: set_inputs
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_run" ]; then
-            echo "tag=${{ github.sha }}" >> $GITHUB_ENV
-            echo "push_latest=true" >> $GITHUB_ENV
-          else
-              # workflow_dispatch or other trigger
-              echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
-              echo "push_latest=${{ github.event.inputs.push_latest }}" >> $GITHUB_ENV
-          fi
+jobs:
+    build-image:
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
 
-      - name: Build Image
-        uses: hathitrust/github_actions/build@action-updates
-        with:
-          image: ghcr.io/hathitrust/ht-indexer
-          dockerfile: Dockerfile
-          tag: ${{ env.tag }}
-          push_latest: ${{ env.push_latest}}
-          registry_token: ${{ github.token }}
+        steps:
+            - name: Build Image
+              uses: hathitrust/github_actions/[email protected]
+              with:
+                image: ghcr.io/hathitrust/ht-indexer
+                dockerfile: Dockerfile
+                img_tag: ${{ inputs.img_tag }}
+                tag: ${{ inputs.ref }}
+                push_latest: ${{ inputs.push_latest}}
+                registry_token: ${{ github.token }}
+                rebuild: ${{ inputs.rebuild }}

.github/workflows/tests.yaml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up tests
         run: |
-          docker-compose build
+          docker compose build
 
       - name: Run tests
-        run: docker-compose run test
+        run: docker compose run test

README.md

@@ -339,3 +339,5 @@ Use this curl command to query Sorl
 ``curl http://localhost:9033/solr/catalog/query -d 'json={"query":"ht_id:umn.31951000662660j"}'``
 
 ``poetry run python main.py --host 0.0.0.0 --port 8081 --solr_host localhost --solr_port 8983``
+
+# Another temporary change to remove