Skip to content

Commit 46c3c9c

Browse files
committed
Merge branches 'w/130.0/bugfix/fix-skip-devcontainer-build' and 'q/w/4548/129.0/bugfix/fix-skip-devcontainer-build' into tmp/octopus/q/130.0
3 parents e695813 + 8c54ce6 + 8312978 commit 46c3c9c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/build-docs.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
default: ${{ github.ref }}
99
required: false
1010
type: string
11-
build-devcontainer:
12-
description: "True will build the devcontainer"
13-
default: true
11+
skip-devcontainer:
12+
description: "True will skip the build of the devcontainer"
13+
default: false
1414
required: false
1515
type: boolean
1616
secrets:
@@ -24,10 +24,10 @@ jobs:
2424
uses: ./.github/workflows/build-devcontainer.yaml
2525
secrets: inherit
2626
with:
27-
# NOTE: We check "!= true" instead of just checking the value
27+
# NOTE: We check "== true" instead of just checking the value
2828
# since by default when the workflow is call with "workflow dispatch"
2929
# the input will (sadly) be "" and not use the default value
30-
skip: ${{ inputs.build-devcontainer != true }}
30+
skip: ${{ inputs.skip-devcontainer == true }}
3131

3232
docs:
3333
runs-on: ubuntu-latest

.github/workflows/build.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
default: ${{github.ref}}
99
required: false
1010
type: string
11-
build-devcontainer:
12-
description: "True will build the devcontainer"
13-
default: true
11+
skip-devcontainer:
12+
description: "True will skip the build of the devcontainer"
13+
default: false
1414
required: false
1515
type: boolean
1616
outputs:
@@ -33,10 +33,10 @@ jobs:
3333
uses: ./.github/workflows/build-devcontainer.yaml
3434
secrets: inherit
3535
with:
36-
# NOTE: We check "!= true" instead of just checking the value
36+
# NOTE: We check "== true" instead of just checking the value
3737
# since by default when the workflow is call with "workflow dispatch"
3838
# the input will (sadly) be "" and not use the default value
39-
skip: ${{ inputs.build-devcontainer != true }}
39+
skip: ${{ inputs.skip-devcontainer == true }}
4040

4141
build:
4242
runs-on: ubuntu-latest
@@ -52,8 +52,8 @@ jobs:
5252
# This "ugly" workaround is needed for now because we use a container to run the job
5353
# so we use docker-in-docker but by default github mount the workspace in the container
5454
# not at the same location
55-
# - on the host it's on github.workspace => /home/runner/work/artesca/artesca
56-
# - in the container it's on GITHUB_WORKSPACE => /__w/artesca/artesca
55+
# - on the host it's on github.workspace => /home/runner/work/metalk8s/metalk8s
56+
# - in the container it's on GITHUB_WORKSPACE => /__w/metalk8s/metalk8s
5757
# Which means if we want to creata docker with bind mount we need to use the host path
5858
# that's why we also mount the workspace in the container at the same location
5959
- ${{ github.workspace }}:${{ github.workspace }}
@@ -121,7 +121,7 @@ jobs:
121121
secrets: inherit
122122
with:
123123
ref: ${{ inputs.ref }}
124-
build-devcontainer: false
124+
skip-devcontainer: true
125125

126126
write-final-status:
127127
runs-on: ubuntu-24.04

.github/workflows/pre-merge.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
if: needs.changed-files.outputs.build == 'true'
9191
uses: ./.github/workflows/build.yaml
9292
with:
93-
build-devcontainer: false
93+
skip-devcontainer: true
9494
secrets: inherit
9595

9696
build-docs:
@@ -101,7 +101,7 @@ jobs:
101101
if: needs.changed-files.outputs.docs == 'true' && needs.changed-files.outputs.build != 'true'
102102
uses: ./.github/workflows/build-docs.yaml
103103
with:
104-
build-devcontainer: false
104+
skip-devcontainer: true
105105
secrets: inherit
106106

107107
build-shell-ui:

0 commit comments

Comments
 (0)