Skip to content

Commit 1a22f3e

Browse files
authored
Merge branch 'main' into testbranch
2 parents 9cc30db + a24d409 commit 1a22f3e

File tree

2 files changed

+6
-23
lines changed

2 files changed

+6
-23
lines changed

.github/actions/publishArtifact/action.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/buildAndPublish.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
buildAndPublish:
2929
name: Build and Publish
3030
needs: checkChanges
31-
if: ${{ needs.checkChanges.outputs.hasSrcChanges == 'true' && github.ref_name == 'main' }}
31+
if: ${{ github.event_name == 'workflow_dispatch' || needs.checkChanges.outputs.hasSrcChanges == 'true' }}
3232
runs-on: ubuntu-latest
3333
container: ghcr.io/flxbl-io/sfp:${{ vars.SFP_CONTAINER_VERSION }}
3434
permissions:
@@ -55,12 +55,14 @@ jobs:
5555

5656
- name: Build
5757
run: |
58-
sfp build --devhubalias devhub --diffcheck --buildnumber ${GITHUB_RUN_ID} --branch main --releaseconfig config/releaseConfig.yml
58+
sfp build --devhubalias devhub --diffcheck --buildnumber ${GITHUB_RUN_ID} --branch main --releaseconfig config/releaseConfig.yml --loglevel ${SFP_LOG_LEVEL}
5959
if [ -d "artifacts" ] && [ -n "$(ls -A artifacts)" ]; then
6060
echo "Artifacts found"
6161
else
6262
echo "No artifacts found"
6363
fi
64+
env:
65+
SFP_LOG_LEVEL: ${{ vars.SFP_LOG_LEVEL }}
6466

6567
- name: Publish artifacts
6668
run: |
@@ -81,13 +83,14 @@ jobs:
8183
8284
- name: Generate Release Definition
8385
run: |
84-
sfp releasedefinition generate --gitref ${GIT_REF} --configfile ${PATH_TO_CONFIG_FILE} --releasename ${RELEASE_NAME} --directory ${DIRECTORY} --branchname ${BRANCH_NAME}
86+
sfp releasedefinition generate --gitref ${GIT_REF} --configfile ${PATH_TO_CONFIG_FILE} --releasename ${RELEASE_NAME} --directory ${DIRECTORY} --branchname ${BRANCH_NAME} --loglevel ${SFP_LOG_LEVEL}
8587
env:
8688
GIT_REF: ${{ github.sha }}
8789
PATH_TO_CONFIG_FILE: "config/releaseConfig.yml"
8890
RELEASE_NAME: ${{ steps.generate_name.outputs.releaseName }}
8991
DIRECTORY: "release-definition"
9092
BRANCH_NAME: ${{ github.ref_name }}
93+
SFP_LOG_LEVEL: ${{ vars.SFP_LOG_LEVEL }}
9194

9295
- name: Commit release definition
9396
uses: navikt/sf-platform/.github/actions/commitFiles@f318a266c5a7add9c091f9d3480164fed8abfc08

0 commit comments

Comments
 (0)