Merge pull request #119 from hathitrust/action-updates

Action updates

.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: Build A Branch
+
+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
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    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 
+      
+      - name: Build Image
+        uses: hathitrust/github_actions/build@v1
+        with:
+          image: ghcr.io/${{ github.repository }}-unstable
+          dockerfile: Dockerfile
+          tag: ${{ env.tag }}
+          push_latest: ${{ env.push_latest}}
+          registry_token: ${{ github.token }}

.github/workflows/ci.yml → .github/workflows/tests.yml

@@ -14,8 +14,8 @@ jobs:
 
       - name: Set up tests
         run: |
-          docker-compose build
-          docker-compose run --rm test bundle install
+          docker compose build
+          docker compose run --rm test bundle install
       - name: make coverage directory
         run: mkdir -m 777 coverage
 
@@ -24,10 +24,10 @@ jobs:
         run: chmod -R 777 spec/integration/src
 
       - name: Run standardrb
-        run: docker-compose run --rm test bundle exec standardrb
+        run: docker compose run --rm test bundle exec standardrb
 
       - name: Run tests
-        run: docker-compose run --rm test
+        run: docker compose run --rm test
 
       - name: Report to Coveralls
         uses: coverallsapp/github-action@1.1.3

Dockerfile

@@ -6,7 +6,7 @@ ARG GID=1000
 # for rotatelogs
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   apache2-utils \
-  netcat
+  netcat-traditional
 
 # sdrN for volumes and symlinks
 RUN bash -c 'for i in $(seq 1 24); do ln -s /sdr/$i /sdr$i; done'