Skip to content

Commit 1eb3dae

Browse files
workflows: update deprecated set output workflows (#6336)
* workflows: remove redundant workflows Signed-off-by: Patrick Stephens <pat@calyptia.com> * workflows: remove failing step Signed-off-by: Patrick Stephens <pat@calyptia.com> * workflows: replace deprecated set-output Signed-off-by: Patrick Stephens <pat@calyptia.com> Signed-off-by: Patrick Stephens <pat@calyptia.com>
1 parent 3bdfe5a commit 1eb3dae

13 files changed

+15
-135
lines changed

.github/actions/generate-package-build-matrix/action.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runs:
3333
BUILD_TYPE="2.0"
3434
fi
3535
echo "Detected type: $BUILD_TYPE"
36-
echo ::set-output name=BUILD_TYPE::$BUILD_TYPE
36+
echo "BUILD_TYPE=$BUILD_TYPE" >> $GITHUB_OUTPUT
3737
shell: bash
3838
working-directory: version-check
3939

@@ -78,5 +78,5 @@ runs:
7878
run: |
7979
echo $MATRIX
8080
echo $MATRIX| jq .
81-
echo "::set-output name=matrix::$MATRIX"
81+
echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
8282
shell: bash

.github/actions/release-bucket-sync/action.yaml

-69
This file was deleted.

.github/actions/release-server-sync/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ runs:
4141
id: known_hosts
4242
run: |
4343
OUTPUT=$(ssh-keyscan -H ${{ inputs.server_hostname }})
44-
echo ::set-output name=OUTPUT::$OUTPUT
44+
echo "OUTPUT=$OUTPUT" >> $GITHUB_OUTPUT
4545
shell: bash
4646

4747
- name: Install SSH Key

.github/workflows/build-master-packages.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
fi
3838
echo $matrix
3939
echo $matrix| jq .
40-
echo "::set-output name=matrix::$matrix"
40+
echo "matrix=$matrix" >> $GITHUB_OUTPUT
4141
shell: bash
4242

4343
master-build-packages:

.github/workflows/call-build-linux-packages.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
fi
169169
fi
170170
echo "$TARGET"
171-
echo ::set-output name=target::$TARGET
171+
echo "target=$TARGET" >> $GITHUB_OUTPUT
172172
env:
173173
DISTRO: ${{ matrix.distro }}
174174
shell: bash

.github/workflows/call-build-macos.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
BUILD_TYPE="modern"
6060
fi
6161
echo "Detected type: $BUILD_TYPE"
62-
echo ::set-output name=BUILD_TYPE::$BUILD_TYPE
62+
echo "BUILD_TYPE=$BUILD_TYPE" >> $GITHUB_OUTPUT
6363
shell: bash
6464

6565
call-build-macos-package:

.github/workflows/call-test-images.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
call-test-images-cosign-verify:
4040
name: Cosign verification of container image
4141
environment: ${{ inputs.environment }}
42-
runs-on: [ ubuntu-latest ]
42+
runs-on: ubuntu-latest
4343
steps:
4444
- name: Install cosign
4545
uses: sigstore/cosign-installer@v2
@@ -98,7 +98,7 @@ jobs:
9898
run: |
9999
docker pull --platform=${{ matrix.arch }} "$REGISTRY/$IMAGE_NAME:$IMAGE_TAG"
100100
ACTUAL_ARCH=$(docker image inspect --format '{{.Architecture}}' "$REGISTRY/$IMAGE_NAME:$IMAGE_TAG")
101-
echo ::set-output name=ACTUAL_ARCH::$ACTUAL_ARCH
101+
echo "ACTUAL_ARCH=$ACTUAL_ARCH" >> $GITHUB_OUTPUT
102102
docker image inspect "$REGISTRY/$IMAGE_NAME:$IMAGE_TAG"
103103
shell: bash
104104
env:

.github/workflows/call-test-packages.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
distro: [ amazonlinux2, centos7, centos8, debian10, debian11, ubuntu1804, ubuntu2004 ] #, ubuntu2204 ] TODO: https://github.com/fluent/fluent-bit/issues/5628
37+
distro: [ amazonlinux2022, amazonlinux2, centos7, centos8, debian10, debian11, ubuntu1804, ubuntu2004, ubuntu2204 ]
3838
steps:
3939
- name: Checkout repository
4040
uses: actions/checkout@v3
@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
curl --fail -LO "$AWS_URL/latest-version.txt"
4646
VERSION=$(cat latest-version.txt)
47-
echo ::set-output name=VERSION::$VERSION
47+
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
4848
shell: bash
4949

5050
- name: Run package installation tests

.github/workflows/cron-unstable-build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# For cron builds, i.e. nightly, we provide date and time as extra parameter to distinguish them.
3434
- name: Get current date
3535
id: date
36-
run: echo "::set-output name=date::$(date '+%Y-%m-%d-%H_%M_%S')"
36+
run: echo "date=$(date '+%Y-%m-%d-%H_%M_%S')" >> $GITHUB_OUTPUT
3737

3838
- name: Debug event output
3939
uses: hmarr/debug-action@v2
@@ -65,7 +65,7 @@ jobs:
6565
echo "Unable to determine branch to use"
6666
exit 1
6767
fi
68-
echo "::set-output name=branch::$cron_branch"
68+
echo "branch=$cron_branch" >> $GITHUB_OUTPUT
6969
shell: bash
7070

7171
unstable-build-images:

.github/workflows/pr-perf-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
do
5656
file_test_newlines+=" $line"
5757
done < report.md
58-
echo "::set-output name=report::$file_test_newlines"
58+
echo "report=$file_test_newlines" >> $GITHUB_OUTPUT
5959
shell: bash
6060
working-directory: output
6161

.github/workflows/release-sync.yaml

-32
This file was deleted.

.github/workflows/staging-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
echo "Defaulting to master"
5454
VERSION=master
5555
fi
56-
echo ::set-output name=VERSION::$VERSION
56+
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
5757
shell: bash
5858
env:
5959
# Use the dispatch variable in preference, if empty use the context ref_name which should

.github/workflows/staging-release.yaml

+1-20
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
if [[ $RELEASE_VERSION =~ ^[0-9]+\.[0-9]+ ]]; then
5555
MAJOR_VERSION="${BASH_REMATCH[0]}"
5656
fi
57-
echo "::set-output name=value::$MAJOR_VERSION"
57+
echo "value=$MAJOR_VERSION" >> $GITHUB_OUTPUT
5858
shell: bash
5959
env:
6060
RELEASE_VERSION: ${{ github.event.inputs.version }}
@@ -223,25 +223,6 @@ jobs:
223223
TAG: ${{ matrix.tag }}
224224
shell: bash
225225

226-
staging-release-images-dockerhub-update:
227-
name: Update Dockerhub description
228-
permissions:
229-
contents: read
230-
runs-on: ubuntu-latest
231-
environment: release
232-
needs: staging-release-images
233-
steps:
234-
- uses: actions/checkout@v3
235-
236-
- name: Docker Hub Description
237-
uses: peter-evans/dockerhub-description@v3
238-
with:
239-
username: ${{ secrets.DOCKERHUB_USERNAME }}
240-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
241-
repository: ${{ github.repository }}
242-
readme-filepath: ./dockerfiles/dockerhub-description.md
243-
short-description: 'Fluent Bit, lightweight logs and metrics collector and forwarder'
244-
245226
staging-release-images-sign:
246227
name: Sign container image manifests
247228
permissions:

0 commit comments

Comments
 (0)