fix: github actions

ln-markets · Feb 7, 2024 · 52e616a · 52e616a
1 parent f423bde
commit 52e616a
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 114 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/workflows/build-and-push-latest.yml b/.github/workflows/build-and-push-latest.yml
@@ -8,20 +8,29 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
+      packages: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-qemu-action@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v3
+
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v3
+        with:
+          username: vafanassieff
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Docker meta
+      - uses: docker/metadata-action@v3
         id: meta
-        uses: docker/metadata-action@v3
         with:
           images: |
             ghcr.io/ln-markets/umbrel
@@ -30,21 +39,7 @@ jobs:
             type=ref,event=branch
             type=sha
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: vafanassieff
-          password: ${{ secrets.CR_PAT }}
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -10,20 +10,29 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
+      packages: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-qemu-action@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v3
+
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v3
+        with:
+          username: vafanassieff
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Docker meta
+      - uses: docker/metadata-action@v3
         id: meta
-        uses: docker/metadata-action@v3
         with:
           images: |
             ghcr.io/ln-markets/umbrel
@@ -36,21 +45,7 @@ jobs:
             type=semver,pattern=v{{major}}
             type=sha
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: vafanassieff
-          password: ${{ secrets.CR_PAT }}
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,17 +15,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-qemu-action@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v3
 
-      - name: Build image
-        uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64,linux/arm64