From 9fb308672b5ed83e390b5a9374970cb9b6a6931a Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Fri, 30 Aug 2024 12:46:32 -0700 Subject: [PATCH 1/3] try date in run-name Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 6 ++++++ .github/workflows/nightly.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index c4553f9a6ad..5f14cf1534e 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -83,6 +83,12 @@ jobs: - name: Dump matrix context run: echo '${{ toJson(matrix) }}' + + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: ${{ matrix.java }} build-amazonlinux-latest: if: github.repository_owner == 'valkey-io' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.event.inputs.full-matrix == 'true' diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7ae95494702..c05344a55f8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ concurrency: cancel-in-progress: true run-name: - ${{ github.event_name == 'schedule' && github.event.created_at || (inputs.name == '' && format('{0} @ {1}', github.ref_name, github.sha) || inputs.name) }} + ${{ (github.event_name == 'schedule' && $(date +'%Y-%m-%d')) || (inputs.name == '' && format('{0} @ {1}', github.ref_name, github.sha) || inputs.name) }} # TODO matrix by workflow (`uses`) - not supported yet by GH jobs: From 1f7239809d6b0c765f3d1106035c3e621cbf4a04 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Fri, 30 Aug 2024 12:47:26 -0700 Subject: [PATCH 2/3] fix scheduled jobs Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 4 ++-- .github/workflows/node.yml | 4 ++-- .github/workflows/python.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 5f14cf1534e..2fc74dadc11 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -50,8 +50,8 @@ jobs: get-matrices: runs-on: ubuntu-latest - # Avoid running on schedule on repo forks (scheduled job uses `workflow_call` to call this one) - if: (github.event_name == 'workflow_call') || github.event_name == 'push' || github.event_name == 'pull_request' + # Avoid running on schedule on repo forks + if: (github.event_name == 'schedule') || github.event_name == 'push' || github.event_name == 'pull_request' outputs: engine-matrix-output: ${{ steps.get-matrices.outputs.engine-matrix-output }} host-matrix-output: ${{ steps.get-matrices.outputs.host-matrix-output }} diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index eacc027c74c..02c69aa0608 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -51,8 +51,8 @@ env: jobs: get-matrices: runs-on: ubuntu-latest - # Avoid running on schedule on repo forks (scheduled job uses `workflow_call` to call this one) - if: (github.event_name == 'workflow_call') || github.event_name == 'push' || github.event_name == 'pull_request' + # Avoid running on schedule on repo forks + if: (github.event_name == 'schedule') || github.event_name == 'push' || github.event_name == 'pull_request' outputs: engine-matrix-output: ${{ steps.get-matrices.outputs.engine-matrix-output }} host-matrix-output: ${{ steps.get-matrices.outputs.host-matrix-output }} diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 7d88709a619..a022fb18981 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -55,8 +55,8 @@ permissions: jobs: get-matrices: runs-on: ubuntu-latest - # Avoid running on schedule on repo forks (scheduled job uses `workflow_call` to call this one) - if: (github.event_name == 'workflow_call') || github.event_name == 'push' || github.event_name == 'pull_request' + # Avoid running on schedule on repo forks + if: (github.event_name == 'schedule') || github.event_name == 'push' || github.event_name == 'pull_request' outputs: engine-matrix-output: ${{ steps.get-matrices.outputs.engine-matrix-output }} host-matrix-output: ${{ steps.get-matrices.outputs.host-matrix-output }} From ab48a4f0977e74d9602796bca273079e196e9233 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Fri, 30 Aug 2024 12:53:47 -0700 Subject: [PATCH 3/3] fix lang version selector Signed-off-by: Yury-Fridlyand --- .github/workflows/create-test-matrices/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-test-matrices/action.yml b/.github/workflows/create-test-matrices/action.yml index d1d4cad281a..5eb4b171882 100644 --- a/.github/workflows/create-test-matrices/action.yml +++ b/.github/workflows/create-test-matrices/action.yml @@ -64,9 +64,9 @@ runs: echo 'Select language (framework/SDK) versions to run tests on' if [[ "${{ github.event_name }}" == "pull_request" || "${{ github.event_name }}" == "push" || "${{ inputs.dispatch-run-full-matrix }}" == "false" ]]; then echo 'Pick language versions listed in 'always-run-versions' only - on PR, push or manually triggered job which does not require full matrix' - echo version-matrix=$(jq -c '[.[] | select(.language == "${{ inputs.language-name }}") | .["always-run-versions"] | map({version: .})]' < .github/json_matrices/supported-language-versions.json) >> $GITHUB_OUTPUT + echo version-matrix=$(jq -c '[.[] | select(.language == "${{ inputs.language-name }}") | .["always-run-versions"]][0]' < .github/json_matrices/supported-language-versions.json) >> $GITHUB_OUTPUT else echo 'Pick language versions listed in 'versions' - on cron (schedule) or if manually triggered job requires a full matrix' - echo version-matrix=$(jq -c '[.[] | select(.language == "${{ inputs.language-name }}") | .versions | map({version: .})]' < .github/json_matrices/supported-language-versions.json) >> $GITHUB_OUTPUT + echo version-matrix=$(jq -c '[.[] | select(.language == "${{ inputs.language-name }}") | .versions][0]' < .github/json_matrices/supported-language-versions.json) >> $GITHUB_OUTPUT fi cat $GITHUB_OUTPUT