Skip to content

Commit

Permalink
Further testing matrix configs
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexAxthelm committed Oct 30, 2024
1 parent bef23e7 commit b17775d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 20 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/build-Docker-image-triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ on:
workflow_dispatch:

jobs:
build_docker_image:
name: "Call build and push action"
uses: ./.github/workflows/build-and-push-Docker-image.yml
secrets: inherit
permissions:
packages: write
contents: read
with:
image-name: ${{ github.event.repository.name }}
image-tag: |
${{
github.event_name == 'pull_request' && format('{0}{1}','pr', github.event.pull_request.number) ||
github.event_name == 'schedule' && 'nightly' ||
github.event_name == 'push' && github.ref_name ||
github.event_name == 'workflow_dispatch' && github.ref_name ||
github.sha
}}
# build_docker_image:
# name: "Call build and push action"
# uses: ./.github/workflows/build-and-push-Docker-image.yml
# secrets: inherit
# permissions:
# packages: write
# contents: read
# with:
# image-name: ${{ github.event.repository.name }}
# image-tag: |
# ${{
# github.event_name == 'pull_request' && format('{0}{1}','pr', github.event.pull_request.number) ||
# github.event_name == 'schedule' && 'nightly' ||
# github.event_name == 'push' && github.ref_name ||
# github.event_name == 'workflow_dispatch' && github.ref_name ||
# github.sha
# }}

build_private_docker_image:
name: "Build private docker image"
needs: build_docker_image
# needs: build_docker_image
strategy:
# if one build or test fails, permit the others to run
fail-fast: false
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/build-push-private.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,10 @@ jobs:

- name: Show Matrix
env:
MATRIX: ${{ matrix }}
PEER_GROUP: ${{ matrix.peer_group }}
LANGUAGE: ${{ matrix.language}}
USER_RESULTS: ${{ matrix.user_results }}
USER_ID: ${{ matrix.user_id }}
run: |
echo "$MATRIX" | jq '.'
Expand Down
2 changes: 1 addition & 1 deletion build/config/rmi_pacta_2023q4_pa2024ch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"net_zero_targets": "https://pactadatadev.blob.core.windows.net/project-files/pa2024ch/fin_data_net_zero_targets.csv",
"test_matrix": {
"peer_group": ["bank", "assetmanager", "insurance", "pensionfund", "other"],
"language": ["EN", "DE", "FR"],
"language": ["EN"],
"user_results": ["https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/user_data"],
"include": [
{
Expand Down

0 comments on commit b17775d

Please sign in to comment.