Skip to content

Commit 95a8a1c

Browse files
committed
chore: Utbedret workflows.
- Promoterer pakker ved release til prod - Bruke workflow fra eget repo
1 parent 6b0b139 commit 95a8a1c

File tree

4 files changed

+56
-17
lines changed

4 files changed

+56
-17
lines changed

.github/workflows/buildAndPublish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ jobs:
111111
fi
112112
echo "::endgroup::"
113113
114-
- name: Promote Artifacts
115-
if: steps.build.outputs.artifactsFound == 'true'
116-
run: |
117-
sfp artifacts promote --targetdevhubusername devhub --loglevel="${SFP_LOG_LEVEL}"
114+
# - name: Promote Artifacts
115+
# if: steps.build.outputs.artifactsFound == 'true'
116+
# run: |
117+
# sfp artifacts promote --targetdevhubusername devhub --loglevel="${SFP_LOG_LEVEL}"
118118

119119
- name: Publish Artifacts
120120
if: steps.build.outputs.artifactsFound == 'true'

.github/workflows/releaseToDev.yml

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,34 @@ concurrency:
3434
jobs:
3535
release:
3636
name: Release to DEV
37-
uses: navikt/sf-platform/.github/workflows/release.yml@main
38-
with:
39-
release_tag: ${{ github.event.inputs.release_tag }}
40-
loglevel: ${{ github.event.inputs.loglevel}}
41-
secrets:
42-
SF_DEVHUB_URL: ${{ secrets.SF_DEVHUB_URL }}
43-
TARGET_ORG_URL: ${{ secrets.SF_DEV_URL }}
37+
runs-on: ubuntu-latest
38+
container: ghcr.io/flxbl-io/sfp:${{ vars.SFP_CONTAINER_VERSION || 'latest' }}
4439
permissions:
4540
contents: read
4641
packages: read
42+
steps:
43+
- name: Authenticate Node
44+
uses: actions/setup-node@v4
45+
with:
46+
registry-url: "https://npm.pkg.github.com"
47+
48+
# Sets up Salesforce CLI authentication for the DevHub
49+
- name: Authenticate DevHub
50+
uses: navikt/sf-gha-authenticateOrg@da2f995ee865e05111574719abfc5ba12b459f0c
51+
with:
52+
auth-url: ${{ secrets.SF_DEVHUB_URL }}
53+
alias: "devhub"
54+
55+
- name: Authenticate Dev
56+
uses: navikt/sf-gha-authenticateOrg@da2f995ee865e05111574719abfc5ba12b459f0c
57+
with:
58+
auth-url: ${{ secrets.SF_DEV_URL }}
59+
alias: "dev"
60+
61+
- name: Release to Dev
62+
uses: navikt/sf-gha-release@44e428cf23f621cfccbd7d4a7946b98e53883ca6
63+
with:
64+
release_tag: ${{ github.event.inputs.release_tag }}
65+
target_org_alias: "dev"
66+
devhub_alias: "devhub"
67+
releaseNamePrefix: "sf"

.github/workflows/releaseToProd.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,29 @@ concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref_name }}
1111
jobs:
1212
release:
13-
uses: navikt/sf-platform/.github/workflows/release.yml@main
14-
with:
15-
release_tag: ${{ github.event.inputs.release_tag }}
16-
secrets:
17-
SF_DEVHUB_URL: ${{ secrets.SF_DEVHUB_URL }}
18-
TARGET_ORG_URL: ${{ secrets.SF_DEVHUB_URL }}
13+
name: Release to Production
14+
runs-on: ubuntu-latest
15+
container: ghcr.io/flxbl-io/sfp:${{ vars.SFP_CONTAINER_VERSION || 'latest' }}
1916
permissions:
2017
contents: read
2118
packages: read
19+
steps:
20+
- name: Authenticate Node
21+
uses: actions/setup-node@v4
22+
with:
23+
registry-url: "https://npm.pkg.github.com"
24+
25+
# Sets up Salesforce CLI authentication for the DevHub
26+
- name: Authenticate Production
27+
uses: navikt/sf-gha-authenticateOrg@da2f995ee865e05111574719abfc5ba12b459f0c
28+
with:
29+
auth-url: ${{ secrets.SF_DEVHUB_URL }}
30+
alias: "prod"
31+
32+
- name: Release to Production
33+
uses: navikt/sf-gha-release@44e428cf23f621cfccbd7d4a7946b98e53883ca6
34+
with:
35+
release_tag: ${{ github.event.inputs.release_tag }}
36+
target_org_alias: "prod"
37+
devhub_alias: "prod"
38+
releaseNamePrefix: "sf"

config/releaseConfig.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
pool: ciPlatform
44
releasedefinitionProperties:
55
skipIfAlreadyInstalled: true
6+
promotePackagesBeforeDeploymentToOrg: prod
67
changelog:
78
workItemFilters:
89
- PTCRM-[0-9]

0 commit comments

Comments
 (0)