Skip to content

Commit d409632

Browse files
AvalinAvalin
committed
Removed use of 'inherit' in ci-cd-pipeline.yml
1 parent 3ace79d commit d409632

File tree

8 files changed

+109
-28
lines changed

8 files changed

+109
-28
lines changed

‎.github/workflows/ci-cd-pipeline.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ jobs:
144144
buildTargets: ${{ inputs.buildTargets }}
145145
combineArtifacts: ${{ needs.unpack_inputs.outputs.requiresCombined }}
146146
skipPerBuildTargetArtifacts: ${{ needs.unpack_inputs.outputs.skipPerBuildTarget }}
147-
secrets: inherit
148147

149148
# ─────────────────────────────────────────────────────────────────────────────
150149
# 4. Deploy
@@ -169,7 +168,26 @@ jobs:
169168
buildTargets: ${{ inputs.buildTargets }}
170169
hasCombinedArtifacts: ${{ needs.unpack_inputs.outputs.requiresCombined }}
171170
artifactSource: build
172-
secrets: inherit
171+
secrets:
172+
CICD_PAT: ${{ secrets.CICD_PAT }}
173+
DEPLOY_API_KEY: ${{ secrets.DEPLOY_API_KEY }}
174+
ITCH_USERNAME: ${{ secrets.ITCH_USERNAME }}
175+
ITCH_PROJECT: ${{ secrets.ITCH_PROJECT }}
176+
APPCENTER_OWNER_NAME: ${{ secrets.APPCENTER_OWNER_NAME }}
177+
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
178+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
179+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
180+
S3_BUCKET: ${{ secrets.S3_BUCKET }}
181+
STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
182+
STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
183+
STEAM_APP_ID: ${{ secrets.STEAM_APP_ID }}
184+
STEAM_DEPOT_VDF_PATH: ${{ secrets.STEAM_DEPOT_VDF_PATH }}
185+
APPSTORE_API_KEY_ID: ${{ secrets.APPSTORE_API_KEY_ID }}
186+
APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
187+
APPSTORE_API_PRIVATE_KEY: ${{ secrets.APPSTORE_API_PRIVATE_KEY }}
188+
CUSTOM_SERVER_HOST: ${{ secrets.CUSTOM_SERVER_HOST }}
189+
CUSTOM_SERVER_USER: ${{ secrets.CUSTOM_SERVER_USER }}
190+
CUSTOM_SERVER_KEY: ${{ secrets.CUSTOM_SERVER_KEY }}
173191

174192
# ─────────────────────────────────────────────────────────────────────────────
175193
# 5. Notify
@@ -199,4 +217,6 @@ jobs:
199217
testsTotal: ${{ needs.run_tests.outputs.totalTests }}
200218
testsPassed: ${{ needs.run_tests.outputs.passedTests }}
201219
testsFailedNames: ${{ needs.run_tests.outputs.failedTestNames }}
202-
secrets: inherit
220+
secrets:
221+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
222+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

‎.github/workflows/step-1-test.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,9 @@ on:
4747
description: "List of failed test names (multiline string or 'None' if no failures)"
4848
value: ${{ jobs.summarize_tests.outputs.failedTestNames }}
4949
secrets:
50-
UNITY_EMAIL:
51-
required: true
52-
UNITY_PASSWORD:
53-
required: true
54-
UNITY_LICENSE:
55-
required: true
50+
UNITY_EMAIL: { required: true }
51+
UNITY_PASSWORD: { required: true }
52+
UNITY_LICENSE: { required: true }
5653

5754
jobs:
5855
upload_unity_license:

‎.github/workflows/step-3-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
description: "Whether to skip uploading per-platform artifacts"
2929
type: string
3030
default: "false"
31-
required: false
31+
required: false
3232
outputs:
3333
releaseErrorMessage:
3434
description: "Error message if release failed"

‎.github/workflows/step-5-notify.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ on:
3434
required: false
3535
type: string
3636
default: "None (tests were not run)"
37+
secrets:
38+
SLACK_WEBHOOK: { required: false }
39+
DISCORD_WEBHOOK: { required: false }
3740

3841
jobs:
3942
notify:
@@ -73,10 +76,9 @@ jobs:
7376
failure) COLOR="danger" ;;
7477
*) COLOR="#cccccc" ;;
7578
esac
76-
77-
# Interpret literal newlines correctly
79+
7880
TEXT=$'*${{ steps.generate_notification.outputs.title }}* - `${{ github.repository }}`\n${{ steps.generate_notification.outputs.slackMessage }}'
79-
81+
8082
PAYLOAD=$(jq -n \
8183
--arg text "$TEXT" \
8284
--arg color "$COLOR" \
@@ -85,34 +87,33 @@ jobs:
8587
attachments: [{ color: $color }]
8688
}'
8789
)
88-
90+
8991
RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -X POST -H "Content-Type: application/json" \
9092
-d "$PAYLOAD" "$SLACK_WEBHOOK")
91-
93+
9294
if [ "$RESPONSE" -ge 200 ] && [ "$RESPONSE" -lt 300 ]; then
9395
echo "SLACK_STATUS=✅ Notification sent" >> $GITHUB_ENV
9496
else
9597
echo "SLACK_STATUS=❌ Failed to send (HTTP $RESPONSE)" >> $GITHUB_ENV
9698
fi
9799
env:
98-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
99-
100+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
101+
100102
# ───── Discord ─────
101103
- name: 📢 Send Discord Notification (if configured)
102104
if: ${{ env.DISCORD_WEBHOOK != '' }}
103105
continue-on-error: true
104106
run: |
105-
# Interpret literal newlines correctly
106107
TEXT=$'${{ steps.generate_notification.outputs.discordMessage }}'
107-
108+
108109
PAYLOAD=$(jq -n \
109110
--arg content "$TEXT" \
110111
'{ content: $content }'
111112
)
112-
113+
113114
RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -X POST -H "Content-Type: application/json" \
114115
-d "$PAYLOAD" "$DISCORD_WEBHOOK")
115-
116+
116117
if [ "$RESPONSE" -ge 200 ] && [ "$RESPONSE" -lt 300 ]; then
117118
echo "DISCORD_STATUS=✅ Notification sent" >> $GITHUB_ENV
118119
else

‎.github/workflows/test-step-2-build-workflow.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,7 @@ jobs:
6464
projectName: ${{ needs.prepare_metadata.outputs.projectName }}
6565
buildTargets: ${{ inputs.buildTargets }}
6666
combineArtifacts: ${{ needs.prepare_metadata.outputs.requiresCombined }}
67-
secrets: inherit
67+
secrets:
68+
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
69+
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
70+
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}

‎.github/workflows/test-step-4-deploy-workflow.yml‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,26 @@ jobs:
133133
buildTargets: ${{ inputs.buildTargets }}
134134
hasCombinedArtifacts: ${{ needs.prepare_metadata.outputs.requiresCombined }}
135135
artifactSource: ${{ inputs.artifactSource }}
136-
secrets: inherit
136+
secrets:
137+
CICD_PAT: ${{ secrets.CICD_PAT }}
138+
DEPLOY_API_KEY: ${{ secrets.DEPLOY_API_KEY }}
139+
ITCH_USERNAME: ${{ secrets.ITCH_USERNAME }}
140+
ITCH_PROJECT: ${{ secrets.ITCH_PROJECT }}
141+
APPCENTER_OWNER_NAME: ${{ secrets.APPCENTER_OWNER_NAME }}
142+
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
143+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
144+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
145+
S3_BUCKET: ${{ secrets.S3_BUCKET }}
146+
STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
147+
STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
148+
STEAM_APP_ID: ${{ secrets.STEAM_APP_ID }}
149+
STEAM_DEPOT_VDF_PATH: ${{ secrets.STEAM_DEPOT_VDF_PATH }}
150+
APPSTORE_API_KEY_ID: ${{ secrets.APPSTORE_API_KEY_ID }}
151+
APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
152+
APPSTORE_API_PRIVATE_KEY: ${{ secrets.APPSTORE_API_PRIVATE_KEY }}
153+
CUSTOM_SERVER_HOST: ${{ secrets.CUSTOM_SERVER_HOST }}
154+
CUSTOM_SERVER_USER: ${{ secrets.CUSTOM_SERVER_USER }}
155+
CUSTOM_SERVER_KEY: ${{ secrets.CUSTOM_SERVER_KEY }}
137156

138157
test_deploy_from_release:
139158
name: 🌍 Test Deploy From Release
@@ -148,4 +167,23 @@ jobs:
148167
buildTargets: '[]'
149168
hasCombinedArtifacts: ${{ needs.validate_release.outputs.hasCombinedArtifacts }}
150169
artifactSource: release
151-
secrets: inherit
170+
secrets:
171+
CICD_PAT: ${{ secrets.CICD_PAT }}
172+
DEPLOY_API_KEY: ${{ secrets.DEPLOY_API_KEY }}
173+
ITCH_USERNAME: ${{ secrets.ITCH_USERNAME }}
174+
ITCH_PROJECT: ${{ secrets.ITCH_PROJECT }}
175+
APPCENTER_OWNER_NAME: ${{ secrets.APPCENTER_OWNER_NAME }}
176+
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
177+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
178+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
179+
S3_BUCKET: ${{ secrets.S3_BUCKET }}
180+
STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
181+
STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
182+
STEAM_APP_ID: ${{ secrets.STEAM_APP_ID }}
183+
STEAM_DEPOT_VDF_PATH: ${{ secrets.STEAM_DEPOT_VDF_PATH }}
184+
APPSTORE_API_KEY_ID: ${{ secrets.APPSTORE_API_KEY_ID }}
185+
APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
186+
APPSTORE_API_PRIVATE_KEY: ${{ secrets.APPSTORE_API_PRIVATE_KEY }}
187+
CUSTOM_SERVER_HOST: ${{ secrets.CUSTOM_SERVER_HOST }}
188+
CUSTOM_SERVER_USER: ${{ secrets.CUSTOM_SERVER_USER }}
189+
CUSTOM_SERVER_KEY: ${{ secrets.CUSTOM_SERVER_KEY }}

‎.github/workflows/test-step-5-notify-workflow.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,6 @@ jobs:
146146
testsTotal: ${{ needs.dry_tests.outputs.totalTests }}
147147
testsPassed: ${{ needs.dry_tests.outputs.passedTests }}
148148
testsFailedNames: ${{ needs.dry_tests.outputs.failedTestNames }}
149-
secrets: inherit
149+
secrets:
150+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
151+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

‎CICD_Workflows/ci-cd-pipeline.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ jobs:
144144
buildTargets: ${{ inputs.buildTargets }}
145145
combineArtifacts: ${{ needs.unpack_inputs.outputs.requiresCombined }}
146146
skipPerBuildTargetArtifacts: ${{ needs.unpack_inputs.outputs.skipPerBuildTarget }}
147-
secrets: inherit
148147

149148
# ─────────────────────────────────────────────────────────────────────────────
150149
# 4. Deploy
@@ -169,7 +168,26 @@ jobs:
169168
buildTargets: ${{ inputs.buildTargets }}
170169
hasCombinedArtifacts: ${{ needs.unpack_inputs.outputs.requiresCombined }}
171170
artifactSource: build
172-
secrets: inherit
171+
secrets:
172+
CICD_PAT: ${{ secrets.CICD_PAT }}
173+
DEPLOY_API_KEY: ${{ secrets.DEPLOY_API_KEY }}
174+
ITCH_USERNAME: ${{ secrets.ITCH_USERNAME }}
175+
ITCH_PROJECT: ${{ secrets.ITCH_PROJECT }}
176+
APPCENTER_OWNER_NAME: ${{ secrets.APPCENTER_OWNER_NAME }}
177+
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
178+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
179+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
180+
S3_BUCKET: ${{ secrets.S3_BUCKET }}
181+
STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
182+
STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
183+
STEAM_APP_ID: ${{ secrets.STEAM_APP_ID }}
184+
STEAM_DEPOT_VDF_PATH: ${{ secrets.STEAM_DEPOT_VDF_PATH }}
185+
APPSTORE_API_KEY_ID: ${{ secrets.APPSTORE_API_KEY_ID }}
186+
APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
187+
APPSTORE_API_PRIVATE_KEY: ${{ secrets.APPSTORE_API_PRIVATE_KEY }}
188+
CUSTOM_SERVER_HOST: ${{ secrets.CUSTOM_SERVER_HOST }}
189+
CUSTOM_SERVER_USER: ${{ secrets.CUSTOM_SERVER_USER }}
190+
CUSTOM_SERVER_KEY: ${{ secrets.CUSTOM_SERVER_KEY }}
173191

174192
# ─────────────────────────────────────────────────────────────────────────────
175193
# 5. Notify
@@ -199,4 +217,6 @@ jobs:
199217
testsTotal: ${{ needs.run_tests.outputs.totalTests }}
200218
testsPassed: ${{ needs.run_tests.outputs.passedTests }}
201219
testsFailedNames: ${{ needs.run_tests.outputs.failedTestNames }}
202-
secrets: inherit
220+
secrets:
221+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
222+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

0 commit comments

Comments
 (0)