Skip to content

Commit fe72e0e

Browse files
authored
Merge pull request #8 from Fryguy/fix_version
Fix issue where version format changed in ibmcloud cli
2 parents a3f455b + 81f2fce commit fe72e0e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Check version output is set correctly
2828
run: |
2929
actual_version="$(ibmcloud --version)"
30-
expected_version="ibmcloud ${{ steps.ibmcloud.outputs.version }}+"
30+
expected_version="ibmcloud ${{ steps.ibmcloud.outputs.version }}"
3131
echo "Actual version: $actual_version"
3232
echo "Expected version: $expected_version*"
3333
[[ "$actual_version" == "$expected_version"* ]]

dist/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async function run() {
4141
await exec.exec('ibmcloud', ['--version'], {
4242
listeners: {stdout: (data) => { version += data.toString() }}
4343
});
44-
version = version.split('+')[0].split(' ').pop()
44+
version = version.match(/\d+\.\d+\.\d+/)?.[0]
4545
core.setOutput('version', version)
4646

4747
const plugins = core.getInput('plugins').replace('\n', ' ').replace(',', ' ').split(' ').map(p => p.trim()).filter(p => p)

0 commit comments

Comments
 (0)