Merge branch 'main' into pkg-deps

wabarc · Nov 8, 2022 · 50dffaf · 50dffaf
2 parents 467b85b + ab8032b
commit 50dffaf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -145,7 +145,7 @@ jobs:
           ARGS="${ARGS}-${GOMIPSLE}"
         fi
         make ${ARGS}
-        echo "::set-output name=filename::${{ env.PRODUCT }}-${ARGS}"
+        echo "filename=${{ env.PRODUCT }}-${ARGS}" >> $GITHUB_OUTPUT
 
     - name: Upload binary artifacts
       uses: actions/upload-artifact@v3
@@ -200,7 +200,7 @@ jobs:
         PKG_ARCH="${TARGET//v8}"
         PKG_ARCH="${PKG_ARCH//32}"
         make debian DEB_IMG_ARCH=${TARGET} PKG_ARCH=${PKG_ARCH}
-        echo "::set-output name=filename::${{ env.PRODUCT }}-deb-${PKG_ARCH}"
+        echo "filename=${{ env.PRODUCT }}-deb-${PKG_ARCH}" >> $GITHUB_OUTPUT
 
     - name: Upload archived binary
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -9,20 +9,20 @@ on:
     - cron: '0 0 * * *'
   push:
     tags:
-      - 'v*'
+      - "v*"
     branches:
       - 'main'
       - 'develop'
     paths-ignore:
-      - '**.md'
+      - "**.md"
       - 'snapcraft.yaml'
       - '.github/**'
       - '!.github/workflows/docker.yml'
   pull_request:
     branches:
       - 'main'
     paths-ignore:
-      - '**.md'
+      - "**.md"
       - 'snapcraft.yaml'
       - '.github/**'
       - '!.github/workflows/docker.yml'
@@ -64,11 +64,11 @@ jobs:
             DOCKER_IMAGE_VERSION=edge
           fi
           TAGS="${TAGS},${DOCKER_HOST}/${DOCKER_IMAGE_SCOPE}:${DOCKER_IMAGE_VERSION},${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}:${DOCKER_IMAGE_VERSION}"
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=version::${DOCKER_IMAGE_VERSION}
-          echo ::set-output name=docker::${DOCKER_HOST}/${DOCKER_IMAGE_SCOPE}
-          echo ::set-output name=ghcr::${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}
-          echo ::set-output name=images::${DOCKER_HOST}/${DOCKER_IMAGE_SCOPE},${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}
+          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
+          echo "version=${DOCKER_IMAGE_VERSION}" >> $GITHUB_OUTPUT
+          echo "docker=${DOCKER_HOST}/${DOCKER_IMAGE_SCOPE}" >> $GITHUB_OUTPUT
+          echo "ghcr=${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}" >> $GITHUB_OUTPUT
+          echo "images=${DOCKER_HOST}/${DOCKER_IMAGE_SCOPE},${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 # v2.0.0
@@ -191,10 +191,10 @@ jobs:
             DOCKER_IMAGE_VERSION=edge
           fi
           TAGS="${TAGS},${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}:${DOCKER_IMAGE_VERSION}"
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=version::${DOCKER_IMAGE_VERSION}
-          echo ::set-output name=ghcr::${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}
-          echo ::set-output name=images::${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}
+          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
+          echo "version=${DOCKER_IMAGE_VERSION}" >> $GITHUB_OUTPUT
+          echo "ghcr=${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}" >> $GITHUB_OUTPUT
+          echo "images=${GHCR_HOST}/${DOCKER_IMAGE_SCOPE}" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 # v2.0.0

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -105,7 +105,7 @@ jobs:
           ARGS="${ARGS}-${GOMIPSLE}"
         fi
         make ${ARGS}
-        echo "::set-output name=args::${ARGS}"
+        echo "args=${ARGS}" >> $GITHUB_OUTPUT
 
     - name: Archive binary
       run: make TARGET=${{ steps.builder.outputs.args }} releases
@@ -230,7 +230,7 @@ jobs:
       run: |
         version=$(git describe --tags `git rev-list --tags --max-count=1` | sed -e 's/v//g')
         sed -i "s/version: 'git'/version: '${version}'/g" snapcraft.yaml
-        echo "::set-output name=version::${version}"
+        echo "version=${version}" >> $GITHUB_OUTPUT
 
     - id: build
       name: Build Snap
@@ -307,7 +307,7 @@ jobs:
         digest=$(find *${{ env.PRODUCT }}* -type f -exec sha256sum {} +)
         output="${digest//$'%'/%25}"
         output="${output//$'\n'/%0A}"
-        echo "::set-output name=result::$output"
+        echo "result=${output}" >> $GITHUB_OUTPUT
         # Write digest to file
         version=${{ needs.snapcraft.outputs.version }}
         echo "${digest}" > "${{ env.PRODUCT }}-${version}-checksums.txt"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Sign images using cosign
-- Define recommends package ([#243](https://github.com/wabarc/wayback/pull/243))
+- Replace set-output with recommended env output ([#234](https://github.com/wabarc/wayback/pull/234))
+- Specify dependencies for the distribution package ([#243](https://github.com/wabarc/wayback/pull/243))
 
 ## [0.18.1] - 2022-10-30