Skip to content

Commit 8d7634d

Browse files
committed
fix it
1 parent 70e2b44 commit 8d7634d

5 files changed

Lines changed: 108 additions & 235 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"args": {
77
"DOCKER_GID": "${env:DOCKER_GID:}",
88
"IMAGE_NAME": "node_24_python_3_14",
9-
"IMAGE_VERSION": "e0808a3",
9+
"IMAGE_VERSION": "pr-18-f24c020",
1010
"USER_UID": "${localEnv:USER_ID:}",
1111
"USER_GID": "${localEnv:GROUP_ID:}"
1212
},

.github/workflows/pull_request.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
asdf_version: ${{ steps.asdf-version.outputs.version }}
2323
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
2424
devcontainer_version: ${{ steps.load-config.outputs.DEVCONTAINER_VERSION }}
25+
devcontainer_image: ${{ steps.load-config.outputs.DEVCONTAINER_IMAGE }}
2526
steps:
2627
- name: Checkout code
2728
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -33,14 +34,18 @@ jobs:
3334
id: load-config
3435
run: |
3536
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
37+
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
3638
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
37-
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
38-
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION" >> "$GITHUB_OUTPUT"
39+
{
40+
echo "TAG_FORMAT=$TAG_FORMAT"
41+
echo "DEVCONTAINER_IMAGE=$DEVCONTAINER_IMAGE"
42+
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION"
43+
} >> "$GITHUB_OUTPUT"
3944
quality_checks:
4045
uses: ./.github/workflows/quality-checks.yml
4146
needs: [get_config_values]
4247
with:
43-
runtime_docker_image: "node_24_python_3_14:${{ needs.get_config_values.outputs.devcontainer_version }}"
48+
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:github-actions-${{ needs.get_config_values.outputs.devcontainer_version }}"
4449
secrets:
4550
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4651
tag_release:

0 commit comments

Comments
 (0)