From 092ae3d5678a581d8bd2327c5f6d6161fb6b7f6f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 18 Oct 2022 11:00:00 +0200 Subject: [PATCH] github: Use recommended way of setting output --- .../.github/workflows/containerd-apply-patch.sh | 4 ++-- .../.github/workflows/containerd-releases-main.yml | 6 +++--- .../.github/workflows/docker-apply-patch.sh | 4 ++-- .../.github/workflows/docker-releases-main.yml | 8 ++++---- .../.github/workflows/firmware-apply-patch.sh | 4 ++-- .../.github/workflows/firmware-releases-main.yml | 4 ++-- .../coreos-overlay/.github/workflows/go-apply-patch.sh | 8 ++++---- .../coreos-overlay/.github/workflows/go-releases-main.yml | 4 ++-- .../coreos-overlay/.github/workflows/runc-apply-patch.sh | 4 ++-- .../.github/workflows/runc-releases-main.yml | 6 +++--- .../coreos-overlay/.github/workflows/rust-apply-patch.sh | 4 ++-- .../.github/workflows/rust-release-main.yml | 4 ++-- .../coreos-overlay/.github/workflows/setup-flatcar-sdk.sh | 6 +++--- .../.github/workflows/vmware-apply-patch.sh | 4 ++-- .../.github/workflows/vmware-releases-main.yml | 6 +++--- 15 files changed, 38 insertions(+), 38 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh index eafdf2ac38..1137195dd9 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh @@ -48,5 +48,5 @@ generate_patches app-emulation containerd Containerd apply_patches -echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" -echo ::set-output name=UPDATE_NEEDED::"${UPDATE_NEEDED}" +echo "VERSION_OLD=${VERSION_OLD}" >>"${GITHUB_OUTPUT}" +echo "UPDATE_NEEDED=${UPDATE_NEEDED}" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-main.yml index 040bccfb24..0a841fee2e 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-main.yml @@ -18,9 +18,9 @@ jobs: versionMain=$(git -C containerd ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v[0-9]*\.[0-9]*\.[0-9]*$/s/^refs\/tags\/v//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -n1) commitMain=$(git -C containerd rev-parse v${versionMain}) rm -rf containerd - echo ::set-output name=VERSION_MAIN::$(echo ${versionMain}) - echo ::set-output name=COMMIT_MAIN::$(echo ${commitMain}) - echo ::set-output name=BASE_BRANCH_MAIN::main + echo "VERSION_MAIN=${versionMain}" >>"${GITHUB_OUTPUT}" + echo "COMMIT_MAIN=${commitMain}" >>"${GITHUB_OUTPUT}" + echo "BASE_BRANCH_MAIN=main" >>"${GITHUB_OUTPUT}" - name: Set up Flatcar SDK id: setup-flatcar-sdk run: .github/workflows/setup-flatcar-sdk.sh diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh index 2e953f33f9..262e823e57 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh @@ -60,5 +60,5 @@ generate_patches app-emulation docker Docker app-emulation/docker-cli app-torcx/ apply_patches -echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" -echo ::set-output name=UPDATE_NEEDED::"${UPDATE_NEEDED}" +echo "VERSION_OLD=${VERSION_OLD}" >>"${GITHUB_OUTPUT}" +echo "UPDATE_NEEDED=${UPDATE_NEEDED}" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-main.yml index 8984c00464..cbf6c72fb2 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-main.yml @@ -20,10 +20,10 @@ jobs: commitMain=$(git -C docker rev-parse --short=10 v${versionMain}) commitCli=$(git -C docker-cli rev-parse --short=10 v${versionMain}) rm -rf docker docker-cli - echo ::set-output name=VERSION_MAIN::$(echo ${versionMain}) - echo ::set-output name=COMMIT_MAIN::$(echo ${commitMain}) - echo ::set-output name=COMMIT_CLI::$(echo ${commitCli}) - echo ::set-output name=BASE_BRANCH_MAIN::main + echo "VERSION_MAIN=${versionMain}" >>"${GITHUB_OUTPUT}" + echo "COMMIT_MAIN=${commitMain}" >>"${GITHUB_OUTPUT}" + echo "COMMIT_CLI=${commitCli}" >>"${GITHUB_OUTPUT}" + echo "BASE_BRANCH_MAIN=main" >>"${GITHUB_OUTPUT}" - name: Set up Flatcar SDK id: setup-flatcar-sdk run: .github/workflows/setup-flatcar-sdk.sh diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh index 430ceec9ba..eaa15ab499 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-apply-patch.sh @@ -36,5 +36,5 @@ generate_patches sys-kernel coreos-firmware "Linux Firmware" apply_patches -echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" -echo ::set-output name=UPDATE_NEEDED::"${UPDATE_NEEDED}" +echo "VERSION_OLD=${VERSION_OLD}" >>"${GITHUB_OUTPUT}" +echo "UPDATE_NEEDED=${UPDATE_NEEDED}" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-releases-main.yml index 5abe34afa0..4bbba9a584 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/firmware-releases-main.yml @@ -17,8 +17,8 @@ jobs: git clone --depth=1 --no-checkout https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git versionMain=$(git -C linux-firmware ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/[0-9]*$/s/^refs\/tags\///p" | sort -ruV | head -n1) rm -rf linux-firmware - echo ::set-output name=VERSION_MAIN::$(echo ${versionMain}) - echo ::set-output name=BASE_BRANCH_MAIN::main + echo "VERSION_MAIN=${versionMain}" >>"${GITHUB_OUTPUT}" + echo "BASE_BRANCH_MAIN=main" >>"${GITHUB_OUTPUT}" - name: Set up Flatcar SDK id: setup-flatcar-sdk run: .github/workflows/setup-flatcar-sdk.sh diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh index ac8734f380..ebfb386aeb 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh @@ -76,7 +76,7 @@ apply_patches vo_gh="$(join_by ' and ' "${UPDATED_VERSIONS_OLD[@]}")" vn_gh="$(join_by ' and ' "${UPDATED_VERSIONS_NEW[@]}")" -echo ::set-output name=VERSIONS_OLD::"${vo_gh}" -echo ::set-output name=VERSIONS_NEW::"${vn_gh}" -echo ::set-output name=BRANCH_NAME::"${branch_name}" -echo ::set-output name=UPDATE_NEEDED::"1" +echo "VERSIONS_OLD=${vo_gh}" >>"${GITHUB_OUTPUT}" +echo "VERSIONS_NEW=${vn_gh}" >>"${GITHUB_OUTPUT}" +echo "BRANCH_NAME=${branch_name}" >>"${GITHUB_OUTPUT}" +echo "UPDATE_NEEDED=1" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml index 176e5870f7..be52df41e8 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml @@ -22,8 +22,8 @@ jobs: versionsMain+=($(git -C go ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/go${goversion}\(\.[0-9]*\)\?$/s/^refs\/tags\/go//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -1)) done rm -rf go - echo ::set-output name=VERSIONS_MAIN::$(echo ${versionsMain[*]}) - echo ::set-output name=BASE_BRANCH_MAIN::main + echo "VERSIONS_MAIN=${versionsMain[*]}" >>"${GITHUB_OUTPUT}" + echo "BASE_BRANCH_MAIN=main" >>"${GITHUB_OUTPUT}" - name: Set up Flatcar SDK id: setup-flatcar-sdk run: .github/workflows/setup-flatcar-sdk.sh diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh index 0efc7abd11..c25240de1c 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh @@ -57,5 +57,5 @@ generate_patches app-emulation docker-runc Runc apply_patches -echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" -echo ::set-output name=UPDATE_NEEDED::"${UPDATE_NEEDED}" +echo "VERSION_OLD=${VERSION_OLD}" >>"${GITHUB_OUTPUT}" +echo "UPDATE_NEEDED=${UPDATE_NEEDED}" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-main.yml index 1d4a0bd63c..4f75653cac 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-main.yml @@ -22,9 +22,9 @@ jobs: commitMain="$(git -C runc rev-parse v${versionMain})" versionMain="${versionMain//-/_}" rm -rf runc - echo ::set-output name=VERSION_MAIN::$(echo ${versionMain}) - echo ::set-output name=COMMIT_MAIN::$(echo ${commitMain}) - echo ::set-output name=BASE_BRANCH_MAIN::main + echo "VERSION_MAIN=${versionMain}" >>"${GITHUB_OUTPUT}" + echo "COMMIT_MAIN=${commitMain}" >>"${GITHUB_OUTPUT}" + echo "BASE_BRANCH_MAIN=main" >>"${GITHUB_OUTPUT}" - name: Set up Flatcar SDK id: setup-flatcar-sdk run: .github/workflows/setup-flatcar-sdk.sh diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh index c09ced47ac..4ca7d33209 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh @@ -42,5 +42,5 @@ generate_patches dev-lang rust dev-lang/rust profiles apply_patches -echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" -echo ::set-output name=UPDATE_NEEDED::"${UPDATE_NEEDED}" +echo "VERSION_OLD=${VERSION_OLD}" >>"${GITHUB_OUTPUT}" +echo "UPDATE_NEEDED=${UPDATE_NEEDED}" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-main.yml index 4f1f096207..fa85398c3a 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-main.yml @@ -17,8 +17,8 @@ jobs: git clone --depth=1 --no-checkout https://github.com/rust-lang/rust versionMain=$(git -C rust ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/1\.[0-9]*\.[0-9]*$/s/^refs\/tags\///p" | sort -ruV | head -n1) rm -rf rust - echo ::set-output name=VERSION_MAIN::$(echo ${versionMain}) - echo ::set-output name=BASE_BRANCH_MAIN::main + echo "VERSION_MAIN=${versionMain}" >>"${GITHUB_OUTPUT}" + echo "BASE_BRANCH_MAIN=main" >>"${GITHUB_OUTPUT}" - name: Set up Flatcar SDK id: setup-flatcar-sdk run: .github/workflows/setup-flatcar-sdk.sh diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/setup-flatcar-sdk.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/setup-flatcar-sdk.sh index 08ef96bf37..6c60b701a7 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/setup-flatcar-sdk.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/setup-flatcar-sdk.sh @@ -47,6 +47,6 @@ export PACKAGES_CONTAINER="flatcar-packages-${arch}-${docker_vernum}" popd || exit -echo ::set-output name=path::"${PATH}" -echo ::set-output name=PACKAGES_CONTAINER::"${PACKAGES_CONTAINER}" -echo ::set-output name=SDK_NAME::"${SDK_NAME}" +echo "path=${PATH}" >>"${GITHUB_OUTPUT}" +echo "PACKAGES_CONTAINER=${PACKAGES_CONTAINER}" >>"${GITHUB_OUTPUT}" +echo "SDK_NAME=${SDK_NAME}" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh index 20f61d5468..b36b53870e 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-apply-patch.sh @@ -45,5 +45,5 @@ generate_patches app-emulation open-vm-tools open-vm-tools coreos-base/oem-vmwar apply_patches -echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" -echo ::set-output name=UPDATE_NEEDED::"${UPDATE_NEEDED}" +echo "VERSION_OLD=${VERSION_OLD}" >>"${GITHUB_OUTPUT}" +echo "UPDATE_NEEDED=${UPDATE_NEEDED}" >>"${GITHUB_OUTPUT}" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-releases-main.yml index 80dbf35978..dbed7e5c8d 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/vmware-releases-main.yml @@ -18,9 +18,9 @@ jobs: versionMain=$(git -C open-vm-tools ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/stable-[0-9]*\.[0-9]*\.[0-9]*$/s/^refs\/tags\/stable-//p" | sort -ruV | head -n1) buildNumber=$(curl -sSL https://api.github.com/repos/vmware/open-vm-tools/releases/latest | jq -r '.assets[0].name' | sed -n "s/^open-vm-tools-${versionMain}*-\([0-9]*\)\..*/\1/p") rm -rf open-vm-tools - echo ::set-output name=BASE_BRANCH_MAIN::main - echo ::set-output name=BUILD_NUMBER::$(echo ${buildNumber}) - echo ::set-output name=VERSION_MAIN::$(echo ${versionMain}) + echo "BASE_BRANCH_MAIN=main" >>"${GITHUB_OUTPUT}" + echo "BUILD_NUMBER=${buildNumber}" >>"${GITHUB_OUTPUT}" + echo "VERSION_MAIN=${versionMain}" >>"${GITHUB_OUTPUT}" - name: Set up Flatcar SDK id: setup-flatcar-sdk run: .github/workflows/setup-flatcar-sdk.sh