Skip to content

Commit

Permalink
Merge branch 'main' into Issue#1561
Browse files Browse the repository at this point in the history
  • Loading branch information
samj1912 committed Nov 29, 2022
2 parents 64d0b7a + fcf818e commit 92c61db
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ jobs:
id: lifecycle_version
run: |
LIFECYCLE_VERSION=$(./pack-linux/pack report | grep 'Default Lifecycle Version:' | grep -o '[^ ]*$')
echo "::set-output name=version::$LIFECYCLE_VERSION"
echo "version=$LIFECYCLE_VERSION" >> $GITHUB_OUTPUT
- name: Extract pack help
id: pack_help
# Replacements have to do with multiline output.
Expand All @@ -257,7 +257,7 @@ jobs:
PACK_HELP="${PACK_HELP//'%'/'%25'}"
PACK_HELP="${PACK_HELP//$'\n'/'%0A'}"
PACK_HELP="${PACK_HELP//$'\r'/'%0D'}"
echo "::set-output name=help::$PACK_HELP"
echo "help=$PACK_HELP" >> $GITHUB_OUTPUT
- name: Generate changelog
uses: ./.github/workflows/actions/release-notes
id: changelog
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/delivery-archlinux-git.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
version=$(echo "${git_description}" | awk -F- '{print $(1)}' | sed 's/^v//')
revision=$(echo "${git_description}" | awk -F- '{print $(NF-1)}')
commit=$(echo "${git_description}" | awk -F- '{print $(NF)}' | sed 's/^g//')
echo "::set-output name=version::$version"
echo "::set-output name=revision::$revision"
echo "::set-output name=commit::$commit"
echo "version=$version" >> $GITHUB_OUTPUT
echo "revision=$revision" >> $GITHUB_OUTPUT
echo "commit=$commit" >> $GITHUB_OUTPUT
- name: Fill PKGBUILD
uses: cschleiden/replace-tokens@v1
with:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/delivery-archlinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
curl -sSL "$url" -o "$fullpath"
sha512=$(sha512sum "$fullpath" | awk '{ print $1 }')
echo "::set-output name=url::$url"
echo "::set-output name=sha512::$sha512"
echo "url=$url" >> $GITHUB_OUTPUT
echo "sha512=$sha512" >> $GITHUB_OUTPUT
- name: Fill PKGBUILD
uses: cschleiden/replace-tokens@v1
with:
Expand Down Expand Up @@ -120,9 +120,8 @@ jobs:
run: |
curl -sSL ${{ steps.assets.outputs.linux_url }} -o ${{ steps.assets.outputs.linux_name }}
sha512=$(sha512sum ${{ steps.assets.outputs.linux_name }} | cut -d ' ' -f1)
echo "::set-output name=url::${{ steps.assets.outputs.linux_url }}"
echo "::set-output name=sha512::$sha512"
echo "url=${{ steps.assets.outputs.linux_url }}" >> $GITHUB_OUTPUT
echo "sha512=$sha512" >> $GITHUB_OUTPUT
- name: Fill PKGBUILD
uses: cschleiden/replace-tokens@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/delivery-homebrew.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ jobs:
run: |
curl -sSL ${{ steps.assets.outputs.linux_url }} -o ${{ steps.assets.outputs.linux_name }}
linux_sha256=$(sha256sum ${{ steps.assets.outputs.linux_name }} | cut -d ' ' -f1)
echo "::set-output name=linux_sha256::$linux_sha256"
echo "linux_sha256=$linux_sha256" >> $GITHUB_OUTPUT
curl -sSL ${{ steps.assets.outputs.macos_url }} -o ${{ steps.assets.outputs.macos_name }}
macos_sha256=$(sha256sum ${{ steps.assets.outputs.macos_name }} | cut -d ' ' -f1)
echo "::set-output name=macos_sha256::$macos_sha256"
echo "macos_sha256=$macos_sha256" >> $GITHUB_OUTPUT
curl -sSL ${{ steps.assets.outputs.macos_arm64_url }} -o ${{ steps.assets.outputs.macos_arm64_name }}
macos_arm64_sha256=$(sha256sum ${{ steps.assets.outputs.macos_arm64_name }} | cut -d ' ' -f1)
echo "::set-output name=macos_arm64_sha256::$macos_arm64_sha256"
echo "macos_arm64_sha256=$macos_arm64_sha256" >> $GITHUB_OUTPUT
- name: Fill pack.rb
uses: cschleiden/replace-tokens@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delivery-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Metadata
id: metadata
run: |
echo "::set-output name=date::$(date +"%a, %d %b %Y %T %z")"
echo "date=$(date +"%a, %d %b %Y %T %z")" >> $GITHUB_OUTPUT
- name: Determine version
uses: actions/github-script@v6
Expand Down

0 comments on commit 92c61db

Please sign in to comment.