Merge branch 'master' into nginx/1.25.2

wetopi · Sep 15, 2023 · 41442cb · 41442cb
2 parents fdf411d + ec43889
commit 41442cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # https://github.com/FiloSottile/mkcert#installation
     - name: Install and setup mkcert
@@ -34,7 +34,7 @@ jobs:
 
     # https://github.com/marketplace/actions/build-and-push-docker-images
     - name: Build the Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         tags: macbre/nginx

diff --git a/.github/workflows/push-to-ghcr.yml b/.github/workflows/push-to-ghcr.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: "ubuntu-20.04"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # https://github.com/marketplace/actions/push-to-ghcr
       - name: Build and publish a Docker image for macbre/nginx-http3