more working on ssl stuff 3

Author: chadbeaudin

.github/workflows/docker-publish.yml

@@ -14,11 +14,17 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test:
+  ci-cd:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -35,35 +41,16 @@ jobs:
       - name: Run tests
         run: npm test
 
-  build-and-push:
-    needs: test
-    runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
-    permissions:
-      contents: write
-      packages: write
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20'
-
       - name: Get version from package.json
         id: version
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         run: |
           VERSION=$(node -p "require('./package.json').version")
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "Detected version: $VERSION"
-          echo "Event: ${{ github.event_name }}"
-          echo "Ref: ${{ github.ref }}"
-          
+
       - name: Tag Repository
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         continue-on-error: true
         run: |
           NEW_TAG="v${{ steps.version.outputs.version }}"
@@ -87,16 +74,19 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -111,4 +101,5 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Image info
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         run: docker manifest inspect docker.io/bigtimber/street-sweep:latest || true