Merge pull request #98 from freedomofpress/enp/update-ci

Update image publish automation to drop redundant prepare job

Author: ryanwhitney

.github/workflows/publish.yaml

@@ -9,42 +9,17 @@ env:
   DEFAULT_BRANCH: main
 
 jobs:
-  prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      actions: read
-    steps:
-    - name: Determine tags
-      id: tags
-      env:
-        BRANCH: ${{ github.ref_name }}
-        SHA: ${{ github.sha }}
-      run: |
-        export TAGS="$BRANCH;$BRANCH-${SHA:0:7}"
-
-        if [ "$BRANCH" = "$DEFAULT_BRANCH" ]; then
-            export TAGS="$TAGS;latest"
-        fi
-
-        echo "tags=$TAGS" >>$GITHUB_OUTPUT
-    outputs:
-        tags: ${{ steps.tags.outputs.tags }}
-
   build:
     name: Build
     uses: freedomofpress/actionslib/.github/workflows/oci-build.yaml@main
-    needs:
-    - prepare
     permissions:
       contents: read
       actions: read
       packages: write
     with:
       context: "."
       containerfile: deploy/Dockerfile
-      tags: ${{ needs.prepare.outputs.tags }}
       registry: ghcr.io/freedomofpress/dangerzone-rocks
+      add-branch-tags: true
     secrets:
       registry-password: ${{ secrets.GITHUB_TOKEN }}