From f13f2faf6eb18568ea3ba50832d41d29d3c203f7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Jun 2024 20:20:38 +0000 Subject: [PATCH 1/2] Update sbt-github-actions to 0.24.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9131afe..4984353 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0") addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.3.4") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0") addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.46") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") From b98b5cb143fb9e7df39fd86cabcd90400ec493fe Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Jun 2024 20:21:08 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 56 +++++++++++++------------------------ .github/workflows/clean.yml | 3 +- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c42ac3b..99a7399 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,43 +28,35 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java (temurin@11) if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 + cache: sbt - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: Setup sbt + uses: sbt/setup-sbt@v1 - name: Check formatting - run: sbt ++${{ matrix.scala }} scalafmtCheckAll scalafmtSbtCheck + run: sbt '++ ${{ matrix.scala }}' scalafmtCheckAll scalafmtSbtCheck - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - name: Build project - run: sbt ++${{ matrix.scala }} test + run: sbt '++ ${{ matrix.scala }}' test - name: Compress target directories run: tar cf targets.tar modules/collector-common/target modules/collector-lite/target modules/collector/target target modules/agent/target modules/common/target modules/agent-common/target modules/agent-kafka/target project/target - name: Upload target directories - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} path: targets.tar @@ -81,31 +73,23 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java (temurin@11) if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 + cache: sbt - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: Setup sbt + uses: sbt/setup-sbt@v1 - name: Download target directories (2.13.8) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} @@ -125,7 +109,7 @@ jobs: env: SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt ++${{ matrix.scala }} ciReleaseSonatype + run: sbt ciReleaseSonatype - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -143,7 +127,7 @@ jobs: run: echo "IS_STABLE_RELEASE=$(if [[ `echo $RELEASE_VERSION | grep '+'` ]]; then echo false; else echo true; fi)" >> $GITHUB_ENV - name: Build GraalVM native image for 'agent' - run: sbt ++${{ matrix.scala }} 'project agent' nativeImage + run: sbt 'project agent' nativeImage - name: Build Docker image for 'agent' uses: docker/build-push-action@v2 @@ -167,7 +151,7 @@ jobs: docker push janstenpickle/trace4cats-agent:${{ env.RELEASE_VERSION }} - name: Build GraalVM native image for 'agent-kafka' - run: sbt ++${{ matrix.scala }} 'project agent-kafka' nativeImage + run: sbt 'project agent-kafka' nativeImage - name: Build Docker image for 'agent-kafka' uses: docker/build-push-action@v2 @@ -191,7 +175,7 @@ jobs: docker push janstenpickle/trace4cats-agent-kafka:${{ env.RELEASE_VERSION }} - name: Build GraalVM native image for 'collector-lite' - run: sbt ++${{ matrix.scala }} 'project collector-lite' nativeImage + run: sbt 'project collector-lite' nativeImage - name: Build Docker image for 'collector-lite' uses: docker/build-push-action@v2 @@ -215,7 +199,7 @@ jobs: docker push janstenpickle/trace4cats-collector-lite:${{ env.RELEASE_VERSION }} - name: Build Docker image for 'collector' - run: 'sbt ++${{ matrix.scala }} ''project collector'' ''set ThisBuild / version := "${{ github.run_number }}"'' ''Docker / publishLocal''' + run: 'sbt ''project collector'' ''set ThisBuild / version := "${{ github.run_number }}"'' ''Docker / publishLocal''' - name: Push Docker images for 'collector' run: | diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 547aaa4..bfc865d 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -17,6 +17,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Delete artifacts + shell: bash {0} run: | # Customize those three lines with your repository and credentials: REPO=${GITHUB_API_URL}/repos/${{ github.repository }} @@ -25,7 +26,7 @@ jobs: ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } # A temporary file which receives HTTP response headers. - TMPFILE=/tmp/tmp.$$ + TMPFILE=$(mktemp) # An associative array, key: artifact name, value: number of artifacts of that name. declare -A ARTCOUNT