Skip to content

Commit

Permalink
Made deployment-tests workflow usable by other projects
Browse files Browse the repository at this point in the history
Ticket: ENT-9170
Changelog: none
  • Loading branch information
craigcomstock committed Aug 23, 2023
1 parent e4b2783 commit 2c95913
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/deployment-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@ jobs:
path: masterfiles
ref: ${{steps.together.outputs.masterfiles || github.base_ref}}

- name: Checkout Buildscripts (current project)
- name: Checkout Buildscripts
uses: actions/checkout@v3
with:
repository: cfengine/buildscripts
path: buildscripts
ref: ${{steps.together.outputs.buildscripts || github.base_ref}}
fetch-depth: 20

- name: Checkout Nova
Expand Down Expand Up @@ -107,6 +109,7 @@ jobs:
deps
- name: Build package in docker
id: build_package
env:
GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE: ${{ secrets.GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE }}
run: |
Expand All @@ -130,7 +133,7 @@ jobs:
key: packages-${{ env.PACKAGE_SHA }}

- name: Save artifacts
if: success() || failure()
if: ${{ success() || failure() && steps.build_package.conclusion != 'success' }}
uses: actions/upload-artifact@v3
with:
name: artifacts
Expand Down
2 changes: 1 addition & 1 deletion ci/package-sha.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CORE_SHA=$(git -C "${NTECH_ROOT}/core" log --pretty='format:%h' -1 -- .)
echo "CORE_SHA: ${CORE_SHA}" >&2
ENTERPRISE_SHA=$(git -C "${NTECH_ROOT}/enterprise" log --pretty='format:%h' -1 -- .)
echo "ENTERPRISE_SHA: ${ENTERPRISE_SHA}" >&2
NOVA_SHA=$(git -C "${NTECH_ROOT}/nova" log --pretty='format:%h' -1 -- .)
NOVA_SHA=$("${NTECH_ROOT}/nova/ci/code-sha.sh")
echo "NOVA_SHA: ${NOVA_SHA}" >&2
MASTERFILES_SHA=$(git -C "${NTECH_ROOT}/masterfiles" log --pretty='format:%h' -1 -- .)
echo "MASTERFILES_SHA: ${MASTERFILES_SHA}" >&2
Expand Down

0 comments on commit 2c95913

Please sign in to comment.