Skip to content

Commit 1933019

Browse files
authored
chore: GH pipeline refinements (#544)
* chore: GH pipeline refinements * chore: GH pipeline refinements --------- Co-authored-by: Christian Lechner <22294087+lechnerc77@users.noreply.github.com>
1 parent 4b13e4b commit 1933019

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

.github/workflows/integration-test.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999

100100
- name: JSON inventory for Subaccount
101101
id: json-inventory-subaccount
102-
if: ${{ success() }} || ${{ failure() }}
102+
if: ${{ success() || failure() }}
103103
run: |
104104
trap 'exit_code=$?; if [ $exit_code -ne 0 ]; then echo "result=failure" >> "$GITHUB_OUTPUT"; fi' EXIT
105105
export BTP_USERNAME=${{ secrets.BTP_USERNAME }}
@@ -152,7 +152,7 @@ jobs:
152152

153153
- name: JSON inventory for Cloud Foundry Org
154154
id: json-inventory-cforg
155-
if: ${{ success() }} || ${{ failure() }}
155+
if: ${{ success() || failure() }}
156156
run: |
157157
trap 'exit_code=$?; if [ $exit_code -ne 0 ]; then echo "result=failure" >> "$GITHUB_OUTPUT"; fi' EXIT
158158
export CF_USER=${{ secrets.BTP_USERNAME }}
@@ -296,7 +296,7 @@ jobs:
296296

297297
- name: Export by JSON for Subaccount
298298
id: export-by-json-subaccount
299-
if: ${{ success() }} || ${{ failure() }}
299+
if: ${{ success() || failure() }}
300300
run: |
301301
trap 'exit_code=$?; if [ $exit_code -ne 0 ]; then echo "result=failure" >> "$GITHUB_OUTPUT"; fi' EXIT
302302
echo "====================================="
@@ -376,7 +376,7 @@ jobs:
376376

377377
- name: Export by JSON for Cloud Foundry Organization
378378
id: export-by-json-cforg
379-
if: ${{ success() }} || ${{ failure() }}
379+
if: ${{ success() || failure() }}
380380
run: |
381381
trap 'exit_code=$?; if [ $exit_code -ne 0 ]; then echo "result=failure" >> "$GITHUB_OUTPUT"; fi' EXIT
382382
echo "====================================="
@@ -420,8 +420,6 @@ jobs:
420420
timeout-minutes: 10
421421
outputs:
422422
output_dir_export_by_res: ${{ steps.export-by-resource-directory.outputs.result }}
423-
output_subacount_export_by_res: ${{ steps.export-by-resource-subaccount.outputs.result }}
424-
output_cforg_export_by_res: ${{ steps.export-by-resource-cforg.outputs.result }}
425423
steps:
426424
- name: Checkout repository
427425
uses: actions/checkout@v6
@@ -500,9 +498,7 @@ jobs:
500498
runs-on: ubuntu-latest
501499
timeout-minutes: 10
502500
outputs:
503-
output_dir_export_by_res: ${{ steps.export-by-resource-directory.outputs.result }}
504501
output_subacount_export_by_res: ${{ steps.export-by-resource-subaccount.outputs.result }}
505-
output_cforg_export_by_res: ${{ steps.export-by-resource-cforg.outputs.result }}
506502
steps:
507503
- name: Checkout repository
508504
uses: actions/checkout@v6
@@ -540,7 +536,7 @@ jobs:
540536

541537
- name: Export by Resource for Subaccount
542538
id: export-by-resource-subaccount
543-
if: ${{ success() }} || ${{ failure() }}
539+
if: ${{ success() || failure() }}
544540
run: |
545541
trap 'exit_code=$?; if [ $exit_code -ne 0 ]; then echo "result=failure" >> "$GITHUB_OUTPUT"; fi' EXIT
546542
echo "====================================="
@@ -620,7 +616,7 @@ jobs:
620616

621617
- name: Export by Resource for Cloud Foundry Organization
622618
id: export-by-resource-cforg
623-
if: ${{ success() }} || ${{ failure() }}
619+
if: ${{ success() || failure() }}
624620
run: |
625621
trap 'exit_code=$?; if [ $exit_code -ne 0 ]; then echo "result=failure" >> "$GITHUB_OUTPUT"; fi' EXIT
626622
echo "====================================="

.github/workflows/publish-chocolatey-package.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
push-to-chocolatey:
1010
description: 'Trigger to update Chocolatey package'
1111
required: true
12-
default: false
12+
default: "false"
1313
release:
1414
types: [published]
1515
permissions:
@@ -36,7 +36,7 @@ jobs:
3636
latest_tag=$(git describe --tags --abbrev=0 --match "v*")
3737
echo "TAG=$latest_tag" >> "$GITHUB_OUTPUT"
3838
fi
39-
39+
4040
- name: Determine Chocolatey push
4141
id: determine-choco-push
4242
run: |
@@ -88,7 +88,7 @@ jobs:
8888
sed -i "s/VERSION/${RELEASE_VERSION}/g" choco/sap-btptf.nuspec
8989
sed -i "s/VERSION/${RELEASE_VERSION}/g" choco/tools/chocolateyInstall.ps1
9090
sed -i "s/CHECKSUM/${SHA256}/g" choco/tools/chocolateyInstall.ps1
91-
91+
9292
- name: Print config
9393
run: |
9494
echo NUSPEC
@@ -102,7 +102,7 @@ jobs:
102102
- name: Choco package
103103
run: |
104104
choco pack choco/sap-btptf.nuspec
105-
105+
106106
- name: Upload package artifact
107107
uses: actions/upload-artifact@v6
108108
with:

.github/workflows/update-brew-formula.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
- name: Extract SHA from release
2626
id: extract-sha
2727
run: |
28-
echo "Event '${{ github.event.action }}'"
2928
echo "BTP Terraform binary hash:"
3029
tag=$(echo ${{ steps.latest-release.outputs.LATEST_TAG }} | cut -c 2-)
3130
darwin_amd64_sha="btptf_${tag}_darwin_amd64.sha256"

0 commit comments

Comments
 (0)