Skip to content

Commit 7df591d

Browse files
authored
Merge pull request #18 from packagist/version-variable
Only set CI script version once
2 parents b8d1086 + c70329b commit 7df591d

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ inputs:
1616
runs:
1717
using: "composite"
1818
steps:
19+
- name: Set Conductor version
20+
shell: "bash"
21+
run: echo "CONDUCTOR_ACTION_VERSION=1.5.0" >> $GITHUB_ENV
1922
- run: |
2023
CONDUCTOR_TOKEN=$(jq -r '.client_payload.composerAuthentication.token' $GITHUB_EVENT_PATH)
2124
echo "::add-mask::$CONDUCTOR_TOKEN"
@@ -24,7 +27,7 @@ runs:
2427
2528
- name: "Validate GitHub action version"
2629
shell: "bash"
27-
run: "${GITHUB_ACTION_PATH}/bin/ci_version_check.sh ${{ github.event.client_payload.requirements.minimumCiActionVersion }} 1.4.0"
30+
run: "${GITHUB_ACTION_PATH}/bin/ci_version_check.sh ${{ github.event.client_payload.requirements.minimumCiActionVersion }} $CONDUCTOR_ACTION_VERSION"
2831

2932
- name: "Validate PHP version"
3033
shell: "bash"
@@ -109,7 +112,6 @@ runs:
109112
COMMIT_HASH: ${{ steps.commit_info.outputs.HASH }},
110113
COMMIT_AUTHOR: ${{ steps.commit_info.outputs.AUTHOR }},
111114
COMMIT_MESSAGE: ${{ steps.commit_info.outputs.MESSAGE }}
112-
CI_VERSION: "1.5.0"
113115
run: |
114116
jq -n '{
115117
"runId": env.RUN_ID,
@@ -120,7 +122,7 @@ runs:
120122
"message": env.COMMIT_MESSAGE
121123
},
122124
"versions": {
123-
"ciScriptVersion": env.CI_VERSION
125+
"ciScriptVersion": env.CONDUCTOR_ACTION_VERSION
124126
}
125127
}' | curl -fsSL -X POST \
126128
-u "${{ github.event.client_payload.webhook.authentication.username }}:${{ github.event.client_payload.webhook.authentication.password }}" \
@@ -135,7 +137,6 @@ runs:
135137
COMMIT_HASH: ${{ steps.commit_info.outputs.HASH }}
136138
COMMIT_AUTHOR: ${{ steps.commit_info.outputs.AUTHOR }}
137139
COMMIT_MESSAGE: ${{ steps.commit_info.outputs.MESSAGE }}
138-
CI_VERSION: 1.5.0
139140
if: ${{ failure() }}
140141
run: |
141142
jq -n '{
@@ -146,7 +147,7 @@ runs:
146147
"message": env.COMMIT_MESSAGE
147148
},
148149
"versions": {
149-
"ciScriptVersion": env.CI_VERSION
150+
"ciScriptVersion": env.CONDUCTOR_ACTION_VERSION
150151
}
151152
}' | curl -fsSL -X POST \
152153
-u "${{ github.event.client_payload.webhook.authentication.username }}:${{ github.event.client_payload.webhook.authentication.password }}" \

0 commit comments

Comments
 (0)