try and fix builds

alephdata · May 23, 2023 · 3c51eaf · 3c51eaf
1 parent 2f79acf
commit 3c51eaf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -88,27 +88,32 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with:
           install: true
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/alephdata/followthemoney
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=sha
       - name: Set env
         run: echo "VERSION_NUMBER=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
       - name: Login to GitHub Packages
         uses: docker/login-action@v2
         if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags')
         with:
           registry: ghcr.io
-          username: $GITHUB_ACTOR
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: false
-          tags: alephdata/followthemoney:${{ github.sha }}
       - name: Build and push release
         uses: docker/build-push-action@v4
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: alephdata/followthemoney:latest,alephdata/followthemoney:${{ env.VERSION_NUMBER }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -3,8 +3,8 @@ on:
   - push
   - workflow_dispatch
 
-concurrency:
-  group: pages
+# concurrency:
+#   group: pages
 
 jobs:
   build:
@@ -47,7 +47,7 @@ jobs:
 
   deploy:
     if: ${{ github.ref == 'refs/heads/main' }}
-    needs: build
+    needs: ["build"]
     runs-on: ubuntu-latest
 
     permissions: