Skip to content

Commit 78fc8f6

Browse files
committed
Improve version extraction commands in GitHub Actions workflow
1 parent 46b26eb commit 78fc8f6

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
fi
3939
- name: Version
4040
run: |
41-
DEMYX_SSH_ALPINE_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} cat /etc/os-release | grep VERSION_ID | cut -c 12-)"
42-
DEMYX_SSH_OPENSSH_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} ssh -V 2>&1 | cut -c -13 | awk -F '[_]' '{print $2}')"
43-
DEMYX_JQ="$(jq '.alpine = "'"$DEMYX_SSH_ALPINE_VERSION"'" | .ssh = "'"$DEMYX_SSH_OPENSSH_VERSION"'"' version.json)"
41+
DEMYX_SSH_ALPINE_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} sh -c '. /etc/os-release && echo "$VERSION_ID"')"
42+
DEMYX_SSH_OPENSSH_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} ssh -V 2>&1 | sed -n 's/^OpenSSH_\([^ ,]*\).*/\1/p')"
43+
DEMYX_JQ="$(jq --arg alpine "$DEMYX_SSH_ALPINE_VERSION" --arg ssh "$DEMYX_SSH_OPENSSH_VERSION" '.alpine = $alpine | .ssh = $ssh' version.json)"
4444
4545
# Update versions
4646
echo "$DEMYX_JQ" > version.json

0 commit comments

Comments
 (0)