Merge pull request 'Convert to standard htpasswd 4-workflow pattern (no artifacts)' (#8) from fix/workflow-standard into master

Reviewed-on: #8

.gitea/workflows/cron.yaml

@@ -5,62 +5,34 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  build:
+  hadolint:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
+        with:
+          dockerfile: Dockerfile
+
+  build-push:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
-      - name: Build image
-        run: docker build -t ci-image:${{ github.sha }} .
-
-      - name: Save image
-        run: docker save -o image.tar ci-image:${{ github.sha }}
-
-      - name: Upload artifact
-        uses: https://github.com/ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2
-        with:
-          name: docker-image
-          path: image.tar
-          retention-days: 1
-
-  test:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
-
-      - name: Download artifact
-        uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
-        with:
-          name: docker-image
-
-      - name: Load image
-        run: docker load < image.tar
-
-      - name: Run tests
-        run: bash tests/test.sh ci-image:${{ github.sha }}
-
-  push:
-    runs-on: ubuntu-latest
-    needs: test
-    steps:
-      - name: Download artifact
-        uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
-        with:
-          name: docker-image
-
-      - name: Load image
-        run: docker load < image.tar
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@650006c6eb7dba73a995c03b02b2d7f5ca915bee
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+      - id: meta
-      - name: Tag and push
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
-        run: |
+        with:
-          docker tag ci-image:${{ github.sha }} jcabillot/rssbridge:nightly
+          images: jcabillot/rssbridge
-          docker push jcabillot/rssbridge:nightly
+          tags: |
+            type=raw,value=nightly
+            type=sha
+      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitea/workflows/main.yaml

@@ -1,77 +1,38 @@
-name: Main CI
+name: Main Release
 
 on:
   push:
     branches: [master]
 
 jobs:
-  lint:
+  hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
-      - name: Checkout
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-
-      - name: Hadolint
-        uses: hadolint/hadolint-action@2332a7b74a6de0dda2221d575162ebea76ba5e5
         with:
           dockerfile: Dockerfile
 
-  build:
+  build-push:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
-      - name: Build image
-        run: docker build -t ci-image:${{ github.sha }} .
-
-      - name: Save image
-        run: docker save -o image.tar ci-image:${{ github.sha }}
-
-      - name: Upload artifact
-        uses: https://github.com/ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2
-        with:
-          name: docker-image
-          path: image.tar
-          retention-days: 1
-
-  test:
-    runs-on: ubuntu-latest
-    needs: [lint, build]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
-
-      - name: Download artifact
-        uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
-        with:
-          name: docker-image
-
-      - name: Load image
-        run: docker load < image.tar
-
-      - name: Run tests
-        run: bash tests/test.sh ci-image:${{ github.sha }}
-
-  push:
-    runs-on: ubuntu-latest
-    needs: test
-    steps:
-      - name: Download artifact
-        uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
-        with:
-          name: docker-image
-
-      - name: Load image
-        run: docker load < image.tar
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@650006c6eb7dba73a995c03b02b2d7f5ca915bee
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+      - id: meta
-      - name: Tag and push
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
-        run: |
+        with:
-          docker tag ci-image:${{ github.sha }} jcabillot/rssbridge:latest
+          images: jcabillot/rssbridge
-          docker push jcabillot/rssbridge:latest
+          tags: |
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+            type=sha
+      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitea/workflows/pr.yaml

@@ -7,17 +7,9 @@ on:
 jobs:
   hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
       - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
         with:
           dockerfile: Dockerfile
-
-  build-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build -t ci-image:${{ github.sha }} .
-      - run: bash tests/test.sh ci-image:${{ github.sha }}

.gitea/workflows/tag.yaml

@@ -8,13 +8,11 @@ jobs:
   tag:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
         with:
           fetch-depth: 0
-
       - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@4ed44965e0dbd8ab2b466a16da04aec3cc312fd8
+        uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEFAULT_BUMP: patch