From 3822b7d3f733ffbe736f5e2140adf14037b9ec29 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Thu, 13 Oct 2022 13:11:22 +0200 Subject: [PATCH] workflows: replace deprecated set-output command Signed-off-by: Nicola Murino --- .github/workflows/development.yml | 4 ++-- .github/workflows/docker.yml | 22 +++++++++++----------- .github/workflows/release.yml | 22 +++++++++++----------- go.mod | 2 +- go.sum | 4 +++- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index dd56314f..ce67af79 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -405,7 +405,7 @@ jobs: - name: Get commit SHA id: get_commit - run: echo ::set-output name=COMMIT::${GITHUB_SHA::8} + run: echo "COMMIT=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT shell: bash - name: Build on amd64 @@ -505,7 +505,7 @@ jobs: cd pkgs ./build.sh PKG_VERSION=$(cat dist/version) - echo "::set-output name=pkg-version::${PKG_VERSION}" + echo "pkg-version=${PKG_VERSION}" >> $GITHUB_OUTPUT - name: Upload Debian Package uses: actions/upload-artifact@v3 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index da50018b..d40e6c50 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -114,22 +114,22 @@ jobs: done if [[ $OPTIONAL_DEPS == true ]]; then - echo ::set-output name=version::${VERSION} - echo ::set-output name=tags::${TAGS} - echo ::set-output name=full::true + echo "version=${VERSION}" >> $GITHUB_OUTPUT + echo "tags=${TAGS}" >> $GITHUB_OUTPUT + echo "full=true" >> $GITHUB_OUTPUT else - echo ::set-output name=version::${VERSION_SLIM} - echo ::set-output name=tags::${TAGS_SLIM} - echo ::set-output name=full::false + echo "version=${VERSION_SLIM}" >> $GITHUB_OUTPUT + echo "tags=${TAGS_SLIM}" >> $GITHUB_OUTPUT + echo "full=false" >> $GITHUB_OUTPUT fi if [[ $DOCKER_PKG == debian-plugins ]]; then - echo ::set-output name=plugins::true + echo "plugins=true" >> $GITHUB_OUTPUT else - echo ::set-output name=plugins::false + echo "plugins=false" >> $GITHUB_OUTPUT fi - echo ::set-output name=dockerfile::${DOCKERFILE} - echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') - echo ::set-output name=sha::${GITHUB_SHA::8} + echo "dockerfile=${DOCKERFILE}" >> $GITHUB_OUTPUT + echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT + echo "sha=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT env: DOCKER_PKG: ${{ matrix.docker_pkg }} OPTIONAL_DEPS: ${{ matrix.optional_deps }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d38a3981..2e3b6ae2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Get SFTPGo version id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT - name: Prepare release run: | @@ -54,7 +54,7 @@ jobs: - name: Get SFTPGo version id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT shell: bash - name: Get OS name @@ -62,9 +62,9 @@ jobs: run: | if [[ $MATRIX_OS =~ ^macos.* ]] then - echo ::set-output name=OS::macOS + echo "OS=macOS" >> $GITHUB_OUTPUT else - echo ::set-output name=OS::windows + echo "OS=windows" >> $GITHUB_OUTPUT fi shell: bash env: @@ -290,9 +290,9 @@ jobs: - name: Get versions id: get_version run: | - echo ::set-output name=SFTPGO_VERSION::${GITHUB_REF/refs\/tags\//} - echo ::set-output name=GO_VERSION::${GO_VERSION} - echo ::set-output name=COMMIT::${GITHUB_SHA::8} + echo "SFTPGO_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT + echo "GO_VERSION=${GO_VERSION}" >> $GITHUB_OUTPUT + echo "COMMIT=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT shell: bash env: GO_VERSION: ${{ env.GO_VERSION }} @@ -398,7 +398,7 @@ jobs: cd pkgs ./build.sh PKG_VERSION=${SFTPGO_VERSION:1} - echo "::set-output name=pkg-version::${PKG_VERSION}" + echo "pkg-version=${PKG_VERSION}" >> $GITHUB_OUTPUT env: SFTPGO_VERSION: ${{ steps.get_version.outputs.SFTPGO_VERSION }} @@ -425,7 +425,7 @@ jobs: - name: Get versions id: get_version run: | - echo ::set-output name=SFTPGO_VERSION::${GITHUB_REF/refs\/tags\//} + echo "SFTPGO_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT shell: bash - name: Download amd64 artifact @@ -485,8 +485,8 @@ jobs: run: | SFTPGO_VERSION=${GITHUB_REF/refs\/tags\//} PKG_VERSION=${SFTPGO_VERSION:1} - echo ::set-output name=SFTPGO_VERSION::${SFTPGO_VERSION} - echo "::set-output name=PKG_VERSION::${PKG_VERSION}" + echo "SFTPGO_VERSION=${SFTPGO_VERSION}" >> $GITHUB_OUTPUT + echo "PKG_VERSION=${PKG_VERSION}" >> $GITHUB_OUTPUT shell: bash - name: Download amd64 artifact diff --git a/go.mod b/go.mod index 04807a05..23f82f4e 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/fatih/color v1.13.0 // indirect - github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-test/deep v1.0.8 // indirect github.com/goccy/go-json v0.9.11 // indirect diff --git a/go.sum b/go.sum index 1c96dc57..dbb8c684 100644 --- a/go.sum +++ b/go.sum @@ -594,8 +594,9 @@ github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= @@ -1916,6 +1917,7 @@ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cIyEbeXLBhy5Ha4nevyc= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=