diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2224e5e..57c7653 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,12 +15,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup JDK - uses: actions/setup-java@v4 - with: - distribution: corretto - java-version: 11 - cache: sbt + - uses: sbt/setup-sbt@v1.1.0 - name: Build and Test run: sbt compile - name: Test Summary diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4120d0e..5b5ccbc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: jobs: scala-maven-release: name: Maven Release - uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@main + uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@v1 permissions: { contents: write, pull-requests: write } secrets: SONATYPE_TOKEN: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN }} @@ -19,11 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: corretto - java-version: 11 - cache: sbt + - uses: sbt/setup-sbt@v1.1.0 - uses: actions/setup-node@v4 with: node-version-file: .nvmrc diff --git a/.github/workflows/sbt-dependency-graph.yaml b/.github/workflows/sbt-dependency-graph.yaml new file mode 100644 index 0000000..b8c4648 --- /dev/null +++ b/.github/workflows/sbt-dependency-graph.yaml @@ -0,0 +1,30 @@ +name: Update Dependency Graph for sbt +on: + push: + branches: + - main + workflow_dispatch: +jobs: + dependency-graph: + runs-on: ubuntu-latest + steps: + - name: Checkout branch + id: checkout + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - name: Install Java + id: java + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.2.0 + with: + distribution: corretto + java-version: 17 + - name: Install sbt + id: sbt + uses: sbt/setup-sbt@8a071aa780c993c7a204c785d04d3e8eb64ef272 # v1.1.0 + - name: Submit dependencies + id: submit + uses: scalacenter/sbt-dependency-submission@64084844d2b0a9b6c3765f33acde2fbe3f5ae7d3 # v3.1.0 + - name: Log snapshot for user validation + id: validate + run: cat ${{ steps.submit.outputs.snapshot-json-path }} | jq + permissions: + contents: write diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml deleted file mode 100644 index d3371b5..0000000 --- a/.github/workflows/snyk.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Snyk - -on: - push: - branches: - - main - workflow_dispatch: - -jobs: - security: - uses: guardian/.github/.github/workflows/sbt-node-snyk.yml@main - with: - DEBUG: true - ORG: guardian-capi - SKIP_NODE: true - - - - secrets: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/version.sbt b/version.sbt index 49b03d2..ff946cb 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "4.0.0" +ThisBuild / version := "4.0.1-SNAPSHOT"