From b597011f01be9051a57d58b0a91c4729b626b804 Mon Sep 17 00:00:00 2001 From: Dennis Meister Date: Fri, 3 May 2024 15:50:25 +0200 Subject: [PATCH 1/3] Fix prepare int test action due to cli update Signed-off-by: Dennis Meister --- .github/actions/prepare-int-tests/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/prepare-int-tests/action.yml b/.github/actions/prepare-int-tests/action.yml index 68689c51..3650775a 100644 --- a/.github/actions/prepare-int-tests/action.yml +++ b/.github/actions/prepare-int-tests/action.yml @@ -30,8 +30,9 @@ runs: shell: bash env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + BRANCH_NAME_PREFIX: "@" run: | - NEW_CONFIG="$(jq --arg BRANCH "$BRANCH_NAME" '.packages[0].version |= $BRANCH' ${{ inputs.package }}/test/.velocitas.json)" + NEW_CONFIG="$(jq --arg BRANCH "$BRANCH_NAME_PREFIX$BRANCH_NAME" '.packages[0].version |= $BRANCH' ${{ inputs.package }}/test/.velocitas.json)" echo "${NEW_CONFIG}" > ${{ inputs.package }}/test/.velocitas.json - name: Install Velocitas CLI and Python requirements From b1efd92c76cf0af76021c61a9f1aed02af8dfe18 Mon Sep 17 00:00:00 2001 From: Dennis Meister Date: Mon, 6 May 2024 09:57:45 +0200 Subject: [PATCH 2/3] Update for slim project config Signed-off-by: Dennis Meister --- .github/actions/prepare-int-tests/action.yml | 2 +- desired_state_generator/test/.velocitas.json | 9 +++------ runtime_kanto/test/.velocitas.json | 9 +++------ runtime_local/test/.velocitas.json | 9 +++------ 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/actions/prepare-int-tests/action.yml b/.github/actions/prepare-int-tests/action.yml index 3650775a..c4cee83b 100644 --- a/.github/actions/prepare-int-tests/action.yml +++ b/.github/actions/prepare-int-tests/action.yml @@ -32,7 +32,7 @@ runs: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BRANCH_NAME_PREFIX: "@" run: | - NEW_CONFIG="$(jq --arg BRANCH "$BRANCH_NAME_PREFIX$BRANCH_NAME" '.packages[0].version |= $BRANCH' ${{ inputs.package }}/test/.velocitas.json)" + NEW_CONFIG="$(jq --arg BRANCH "$BRANCH_NAME_PREFIX$BRANCH_NAME" '.packages |= . + { (. | keys_unsorted[0]): $BRANCH }' ${{ inputs.package }}/.velocitas.json)" echo "${NEW_CONFIG}" > ${{ inputs.package }}/test/.velocitas.json - name: Install Velocitas CLI and Python requirements diff --git a/desired_state_generator/test/.velocitas.json b/desired_state_generator/test/.velocitas.json index c0adae61..c0adc9ef 100644 --- a/desired_state_generator/test/.velocitas.json +++ b/desired_state_generator/test/.velocitas.json @@ -1,8 +1,5 @@ { - "packages": [ - { - "name": "devenv-runtimes", - "version": "hash_id" - } - ] + "packages": { + "devenv-runtimes": "hash_id" + } } diff --git a/runtime_kanto/test/.velocitas.json b/runtime_kanto/test/.velocitas.json index c0adae61..c0adc9ef 100644 --- a/runtime_kanto/test/.velocitas.json +++ b/runtime_kanto/test/.velocitas.json @@ -1,8 +1,5 @@ { - "packages": [ - { - "name": "devenv-runtimes", - "version": "hash_id" - } - ] + "packages": { + "devenv-runtimes": "hash_id" + } } diff --git a/runtime_local/test/.velocitas.json b/runtime_local/test/.velocitas.json index c0adae61..c0adc9ef 100644 --- a/runtime_local/test/.velocitas.json +++ b/runtime_local/test/.velocitas.json @@ -1,8 +1,5 @@ { - "packages": [ - { - "name": "devenv-runtimes", - "version": "hash_id" - } - ] + "packages": { + "devenv-runtimes": "hash_id" + } } From a19ee9fade50e799a37f3797843cdffffe4bc907 Mon Sep 17 00:00:00 2001 From: Dennis Meister Date: Mon, 6 May 2024 09:59:17 +0200 Subject: [PATCH 3/3] Update for slim project config Signed-off-by: Dennis Meister --- .github/actions/prepare-int-tests/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/prepare-int-tests/action.yml b/.github/actions/prepare-int-tests/action.yml index c4cee83b..542475d0 100644 --- a/.github/actions/prepare-int-tests/action.yml +++ b/.github/actions/prepare-int-tests/action.yml @@ -32,7 +32,7 @@ runs: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BRANCH_NAME_PREFIX: "@" run: | - NEW_CONFIG="$(jq --arg BRANCH "$BRANCH_NAME_PREFIX$BRANCH_NAME" '.packages |= . + { (. | keys_unsorted[0]): $BRANCH }' ${{ inputs.package }}/.velocitas.json)" + NEW_CONFIG="$(jq --arg BRANCH "$BRANCH_NAME_PREFIX$BRANCH_NAME" '.packages |= . + { (. | keys_unsorted[0]): $BRANCH }' ${{ inputs.package }}/test/.velocitas.json)" echo "${NEW_CONFIG}" > ${{ inputs.package }}/test/.velocitas.json - name: Install Velocitas CLI and Python requirements