Skip to content

Commit d9f39b2

Browse files
Merge pull request #1237 from NordicSemiconductor/push-xpsppyvzzkrv
Fix: Build the docs from the correct ref
2 parents df66d26 + afd06d6 commit d9f39b2

File tree

9 files changed

+44
-17
lines changed

9 files changed

+44
-17
lines changed

.github/workflows/build_darwin.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ on:
1414
- x64
1515
ref:
1616
description:
17-
Ref (Tag, branch, commit SHA) to release. Default to the
18-
main branch.
17+
Ref (Tag, branch, commit SHA) to release.
18+
Defaults to the ref of the workflow.
1919
type: string
2020
workflow_call:
2121
inputs:
@@ -65,4 +65,4 @@ jobs:
6565
uses: ./.github/actions/publish-action
6666
with:
6767
suffix: macOS-${{ inputs.arch }}
68-
if: github.event_name != 'pull_request'
68+
if: github.event_name != 'pull_request'

.github/workflows/build_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
inputs:
66
ref:
77
description:
8-
Ref (Tag, branch, commit SHA) to release. Default to the
9-
main branch.
8+
Ref (Tag, branch, commit SHA) to release.
9+
Defaults to the ref of the workflow.
1010
type: string
1111
workflow_call:
1212
inputs:

.github/workflows/build_win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
inputs:
66
ref:
77
description:
8-
Ref (Tag, branch, commit SHA) to release. Default to the
9-
main branch.
8+
Ref (Tag, branch, commit SHA) to release.
9+
Defaults to the ref of the workflow.
1010
type: string
1111
workflow_call:
1212
inputs:

.github/workflows/continue-release-production.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
tag:
77
description: Tag of the release to continue.
88
type: string
9+
required: true
910

1011
jobs:
1112
check-version:
@@ -16,7 +17,7 @@ jobs:
1617
id: check
1718
env:
1819
GH_TOKEN: ${{ github.token }}
19-
TAG: ${{ github.event.inputs.tag }}
20+
TAG: ${{ inputs.tag }}
2021
run: |
2122
# Check if this is a release version (not RC)
2223
if [[ "$TAG" == *-rc* ]]; then
@@ -43,15 +44,15 @@ jobs:
4344
uses: ./.github/workflows/continue-release-common.yml
4445
with:
4546
release-type: production
46-
tag: ${{ github.event.inputs.tag }}
47+
tag: ${{ inputs.tag }}
4748
secrets: inherit
4849

4950
copy-to-web-assets:
5051
name: Copy to web-assets to show the release on nordicsemi.com
5152
needs: [check-version, continue-release]
5253
runs-on: ubuntu-latest
5354
env:
54-
TAG: ${{ github.event.inputs.tag }}
55+
TAG: ${{ inputs.tag }}
5556
steps:
5657
- name: Setup JFrog CLI
5758
uses: jfrog/setup-jfrog-cli@v4
@@ -68,5 +69,7 @@ jobs:
6869
6970
publish-docs:
7071
uses: ./.github/workflows/docs-publish-prod.yml
72+
with:
73+
ref: ${{ inputs.tag }}
7174
needs: continue-release
7275
secrets: inherit

.github/workflows/continue-release-rc.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
inputs:
66
tag:
77
description: Tag of the release to continue.
8+
required: true
89
type: string
910

1011
jobs:
@@ -16,7 +17,7 @@ jobs:
1617
id: check
1718
env:
1819
GH_TOKEN: ${{ github.token }}
19-
TAG: ${{ github.event.inputs.tag }}
20+
TAG: ${{ inputs.tag }}
2021
run: |
2122
if [[ "$TAG" != *-rc* ]]; then
2223
echo "::error::Not running because $TAG is not a release candidate version"
@@ -34,5 +35,5 @@ jobs:
3435
uses: ./.github/workflows/continue-release-common.yml
3536
with:
3637
release-type: rc
37-
tag: ${{ github.event.inputs.tag }}
38+
tag: ${{ inputs.tag }}
3839
secrets: inherit

.github/workflows/docs-bundle.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ on:
77
- .github/workflows/docs-bundle.yml
88
- doc
99
workflow_dispatch:
10-
workflow_call:
10+
inputs:
11+
ref:
12+
description:
13+
Ref (Tag, branch, commit SHA) to publish the docs from.
14+
Defaults to the main branch.
15+
type: string
1116

1217
jobs:
1318
create-doc-bundle:
1419
uses: NordicSemiconductor/pc-nrfconnect-shared/.github/workflows/docs-bundle.yml@main
1520
with:
1621
bundle-name: nrf-connect-desktop
22+
ref: ${{ inputs.ref }}

.github/workflows/docs-publish-dev.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ on:
88
- doc
99
- .github/workflows/docs-*.yml
1010
workflow_dispatch:
11+
inputs:
12+
ref:
13+
description:
14+
Ref (Tag, branch, commit SHA) to publish the docs from.
15+
Defaults to the main branch.
16+
type: string
1117

1218
jobs:
1319
publish-docs-bundle:
1420
uses: NordicSemiconductor/pc-nrfconnect-shared/.github/workflows/docs-publish.yml@main
1521
with:
1622
bundle-name: nrf-connect-desktop
1723
release-type: dev
24+
ref: ${{ inputs.ref }}
1825
secrets: inherit

.github/workflows/docs-publish-prod.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,22 @@ name: 'Docs: Publish to prod'
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
ref:
7+
description:
8+
Ref (Tag, branch, commit SHA) to publish the docs from.
9+
Defaults to the main branch.
10+
type: string
511
workflow_call:
12+
inputs:
13+
ref:
14+
type: string
615

716
jobs:
817
publish-docs-bundle:
918
uses: NordicSemiconductor/pc-nrfconnect-shared/.github/workflows/docs-publish.yml@main
1019
with:
1120
bundle-name: nrf-connect-desktop
1221
release-type: prod
22+
ref: ${{ inputs.ref }}
1323
secrets: inherit

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
inputs:
66
ref:
77
description:
8-
Ref (Tag, branch, commit SHA) to release. Default to the
9-
main branch.
8+
Ref (Tag, branch, commit SHA) to release.
9+
Defaults to the ref of the workflow.
1010
type: string
1111

1212
jobs:
@@ -19,7 +19,7 @@ jobs:
1919
- name: Checkout code
2020
uses: actions/checkout@v4
2121
with:
22-
ref: ${{ github.event.inputs.ref }}
22+
ref: ${{ inputs.ref }}
2323

2424
- name: Check version and existence
2525
id: check
@@ -54,7 +54,7 @@ jobs:
5454
needs: check-version
5555
uses: ./.github/workflows/release-common.yml
5656
with:
57-
ref: ${{ github.event.inputs.ref }}
57+
ref: ${{ inputs.ref }}
5858
release-type: production
5959
tag: ${{ needs.check-version.outputs.tag }}
6060
secrets: inherit

0 commit comments

Comments
 (0)