From a157b24bfad2cab893cf95eb339fc1907bcde6ce Mon Sep 17 00:00:00 2001 From: Brian Holt Date: Wed, 18 Sep 2024 19:07:56 -0500 Subject: [PATCH] run githubWorkflowGenerate --- .github/workflows/ci.yml | 62 +++++++++++++++++++++++++++++++--------- .mergify.yml | 23 ++++++--------- 2 files changed, 57 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07fd3c0d..7d9c9058 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,10 @@ jobs: os: [ubuntu-latest] scala: [3, 2.13, 2.12] java: [temurin@8, temurin@11] + project: [fs2-awsJS, fs2-awsJVM] + exclude: + - project: fs2-awsJS + java: temurin@11 runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -71,21 +75,21 @@ jobs: - name: Check that workflows are up to date run: sbt githubWorkflowCheck - - run: sbt '++ ${{ matrix.scala }}' test mimaReportBinaryIssues doc + - run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test mimaReportBinaryIssues doc - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/3.x') - run: mkdir -p core/js/target core/jvm/target aws-java-sdk2/target project/target + run: mkdir -p core/js/target core/jvm/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/3.x') - run: tar cf targets.tar core/js/target core/jvm/target aws-java-sdk2/target project/target + run: tar cf targets.tar core/js/target core/jvm/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/3.x') uses: actions/upload-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} + name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar publish: @@ -133,32 +137,62 @@ jobs: if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (3) + - name: Download target directories (3, fs2-awsJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3 + name: target-${{ matrix.os }}-${{ matrix.java }}-3-fs2-awsJS - - name: Inflate target directories (3) + - name: Inflate target directories (3, fs2-awsJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13) + - name: Download target directories (3, fs2-awsJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13 + name: target-${{ matrix.os }}-${{ matrix.java }}-3-fs2-awsJVM - - name: Inflate target directories (2.13) + - name: Inflate target directories (3, fs2-awsJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12) + - name: Download target directories (2.13, fs2-awsJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12 + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-fs2-awsJS - - name: Inflate target directories (2.12) + - name: Inflate target directories (2.13, fs2-awsJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13, fs2-awsJVM) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-fs2-awsJVM + + - name: Inflate target directories (2.13, fs2-awsJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12, fs2-awsJS) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-fs2-awsJS + + - name: Inflate target directories (2.12, fs2-awsJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12, fs2-awsJVM) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-fs2-awsJVM + + - name: Inflate target directories (2.12, fs2-awsJVM) run: | tar xf targets.tar rm targets.tar @@ -234,5 +268,5 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: fs2-aws_3 fs2-aws_2.13 fs2-aws_2.12 + modules-ignore: fs2-awsnative_3 fs2-awsnative_2.13 fs2-awsnative_2.12 fs2-awsjs_3 fs2-awsjs_2.13 fs2-awsjs_2.12 fs2-awsjvm_3 fs2-awsjvm_2.13 fs2-awsjvm_2.12 configs-ignore: test scala-tool scala-doc-tool test-internal diff --git a/.mergify.yml b/.mergify.yml index 928563f1..6bef1369 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,22 +12,17 @@ pull_request_rules: - or: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - - status-success=Build and Test (ubuntu-latest, 3, temurin@8) - - status-success=Build and Test (ubuntu-latest, 3, temurin@11) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@11) + - status-success=Build and Test (ubuntu-latest, 3, temurin@8, fs2-awsJS) + - status-success=Build and Test (ubuntu-latest, 3, temurin@8, fs2-awsJVM) + - status-success=Build and Test (ubuntu-latest, 3, temurin@11, fs2-awsJVM) + - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, fs2-awsJS) + - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, fs2-awsJVM) + - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11, fs2-awsJVM) + - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, fs2-awsJS) + - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, fs2-awsJVM) + - status-success=Build and Test (ubuntu-latest, 2.12, temurin@11, fs2-awsJVM) actions: merge: {} -- name: Label aws-java-sdk2 PRs - conditions: - - files~=^aws-java-sdk2/ - actions: - label: - add: - - aws-java-sdk2 - remove: [] - name: Label core PRs conditions: - files~=^core/