diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-08-21 07:55:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 07:55:39 +0200 |
| commit | 1cfc7fdf2f80892ea8f15c14f96dc936833cc42b (patch) | |
| tree | 419ad7ff393050c370572fdb65a88972ec325452 | |
| parent | f2e201d496a5a8847fef367a3f60ef1728d90279 (diff) | |
| parent | 8887e3c2b0d59615aaca29140eb7cd1a2ce2c53b (diff) | |
| download | vyos-rolling-nightly-builds-1cfc7fdf2f80892ea8f15c14f96dc936833cc42b.tar.gz vyos-rolling-nightly-builds-1cfc7fdf2f80892ea8f15c14f96dc936833cc42b.zip | |
Merge pull request #4 from Crushable1278/main
Fix environment variable usage
| -rw-r--r-- | .github/workflows/vyos-rolling-nightly-build.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/vyos-rolling-nightly-build.yml b/.github/workflows/vyos-rolling-nightly-build.yml index 34dc1d7..461fbfd 100644 --- a/.github/workflows/vyos-rolling-nightly-build.yml +++ b/.github/workflows/vyos-rolling-nightly-build.yml @@ -62,7 +62,11 @@ jobs: image: vyos/vyos-build:current options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged outputs: + BUILD_BY: ${{ steps.set_env_variables.outputs.BUILD_BY }} build_version: ${{ steps.set_env_variables.outputs.build_version }} + TIMESTAMP: ${{ steps.set_env_variables.outputs.TIMESTAMP }} + PREVIOUS_SUCCESS_BUILD_TIMESTAMP: ${{ steps.set_env_variables.outputs.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }} + steps: ### Initialization ### - uses: actions/checkout@v4 @@ -270,9 +274,9 @@ jobs: shell: bash run: | cd vyos-build - echo "CHANGELOG_COMMIT_VYOS_BUILD=$(git log --since "${{ env.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT + echo "CHANGELOG_COMMIT_VYOS_BUILD=$(git log --since "${{ needs.build_iso.outputs.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT cd ../vyos-1x - echo "CHANGELOG_COMMIT_VYOS_1X=$(git log --since "${{ env.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT + echo "CHANGELOG_COMMIT_VYOS_1X=$(git log --since "${{ needs.build_iso.outputs.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT - name: "Release publishing: generate changelog for vyos-1x" id: generate_changelog_for_vyos-1x @@ -325,7 +329,7 @@ jobs: { "url": "https://github.com/vyos/vyos-rolling-nightly-builds/releases/download/vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64/vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64.iso", "version": "${{ needs.build_iso.outputs.build_version }}", - "timestamp": "${{ env.TIMESTAMP }}" + "timestamp": "${{ needs.build_iso.outputs.TIMESTAMP }}" } ] @@ -340,7 +344,7 @@ jobs: with: tagging_message: ${{ needs.build_iso.outputs.build_version }} commit_message: ${{ needs.build_iso.outputs.build_version }} - commit_author: "vyosbot <${{ env.BUILD_BY }}>" + commit_author: "vyosbot <${{ needs.build_iso.outputs.BUILD_BY }}>" - uses: actions/download-artifact@v4 with: |