Merge ed3ab602f8 into 2e74cbce18

Fix versions check failures (#634 )
* fix macos latest failures * fix failures
2026-06-29 08:38:55 +00:00 · 2024-05-30 19:04:38 +05:30 · 2024-05-22 10:26:50 -05:00 · 2024-02-22 15:57:56 +00:00 · 2023-12-07 12:06:46 +00:00
6 changed files with 4572 additions and 4407 deletions
--- a/.github/workflows/e2e-cache.yml
+++ b/.github/workflows/e2e-cache.yml
@ -21,7 +21,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@ -46,7 +46,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
    needs: gradle-save
    steps:
      - name: Checkout
@ -70,7 +70,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@ -93,7 +93,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
    needs: maven-save
    steps:
      - name: Checkout
@ -121,7 +121,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@ -132,17 +132,21 @@ jobs:
          distribution: 'adopt'
          java-version: '11'
          cache: sbt
+      - name: Setup SBT
+        if: matrix.os == 'macos-13'
+        run: |
+          echo ""Installing SBT...""
+          brew install sbt
      - name: Create files to cache
        run: sbt update

      - name: Check files to cache on macos-latest
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
        run: |
          if [ ! -d ~/Library/Caches/Coursier ]; then
            echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
            exit 1
          fi
-
      - name: Check files to cache on windows-latest
        if: matrix.os == 'windows-latest'
        run: |
@ -150,7 +154,6 @@ jobs:
            echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly"
            exit 1
          fi
-
      - name: Check files to cache on ubuntu-latest
        if: matrix.os == 'ubuntu-latest'
        run: |
@ -158,7 +161,6 @@ jobs:
            echo "::error::The ~/.cache/coursier directory does not exist unexpectedly"
            exit 1
          fi
-
  sbt-restore:
    runs-on: ${{ matrix.os }}
    defaults:
@ -168,7 +170,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
    needs: sbt-save
    steps:
      - name: Checkout
@ -182,14 +184,13 @@ jobs:
          cache: sbt

      - name: Confirm that ~/Library/Caches/Coursier directory has been made
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
        run: |
          if [ ! -d ~/Library/Caches/Coursier ]; then
            echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
            exit 1
          fi
          ls ~/Library/Caches/Coursier
-
      - name: Confirm that ~/AppData/Local/Coursier/Cache directory has been made
        if: matrix.os == 'windows-latest'
        run: |
@ -198,7 +199,6 @@ jobs:
            exit 1
          fi
          ls ~/AppData/Local/Coursier/Cache
-
      - name: Confirm that ~/.cache/coursier directory has been made
        if: matrix.os == 'ubuntu-latest'
        run: |
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@ -20,7 +20,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
        distribution: [
            'temurin',
            'adopt',
@ -32,15 +32,15 @@ jobs:
            'corretto',
            'dragonwell'
          ] # internally 'adopt-hotspot' is the same as 'adopt'
-        version: ['8', '11', '17']
+        version: ['21', '11', '17']
        exclude:
          - distribution: microsoft
            version: 8
          - distribution: dragonwell
-            os: macos-latest
+            os: macos-13
        include:
          - distribution: oracle
-            os: macos-latest
+            os: macos-13
            version: 17
          - distribution: oracle
            os: windows-latest
@ -73,7 +73,7 @@ jobs:
        distribution: ['temurin', 'zulu', 'liberica']
        version:
          - '11.0'
-          - '8.0.302'
+          - '21.0'
          - '17.0.7+7'
        include:
          - distribution: oracle
@ -171,7 +171,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
        version: ['17-ea', '15.0.0-ea.14']
    steps:
      - name: Checkout
@ -215,22 +215,22 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
        distribution: ['temurin', 'zulu', 'liberica', 'semeru']
        java-package: ['jre']
        version: ['17.0']
        include:
          - distribution: 'zulu'
            java-package: jre+fx
-            version: '8'
+            version: '21'
            os: ubuntu-latest
          - distribution: 'zulu'
            java-package: jdk+fx
-            version: '8.0.242'
+            version: '21.0'
            os: ubuntu-latest
          - distribution: 'liberica'
            java-package: jdk+fx
-            version: '8'
+            version: '21'
            os: ubuntu-latest
          - distribution: 'liberica'
            java-package: jre+fx
@ -294,10 +294,10 @@ jobs:
        uses: actions/checkout@v4
      - name: Create .java-version file
        shell: bash
-        run: echo "8" > .java-version
+        run: echo "17" > .java-version
      - name: Create .tool-versions file
        shell: bash
-        run: echo "java 8" > .tool-versions
+        run: echo "java 17" > .tool-versions
      - name: setup-java
        uses: ./
        id: setup-java
@ -351,10 +351,10 @@ jobs:
        uses: actions/checkout@v4
      - name: Create .java-version file
        shell: bash
-        run: echo "11.0.2" > .java-version
+        run: echo "17.0.10" > .java-version
      - name: Create .tool-versions file
        shell: bash
-        run: echo "java 11.0.2" > .tool-versions
+        run: echo "java 17.0.10" > .tool-versions
      - name: setup-java
        uses: ./
        id: setup-java
@ -362,11 +362,11 @@ jobs:
          distribution: ${{ matrix.distribution }}
          java-version-file: ${{matrix.java-version-file }}
      - name: Verify Java
-        run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}"
+        run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}"
        shell: bash

  setup-java-version-from-file-major-minor-patch-with-dist:
-    name: ${{ matrix.distribution }} version from file 'openjdk64-11.0.2' - ${{ matrix.os }}
+    name: ${{ matrix.distribution }} version from file 'openjdk64-17.0.10' - ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      fail-fast: false
@ -379,10 +379,10 @@ jobs:
        uses: actions/checkout@v4
      - name: Create .java-version file
        shell: bash
-        run: echo "openjdk64-11.0.2" > .java-version
+        run: echo "openjdk64-17.0.10" > .java-version
      - name: Create .tool-versions file
        shell: bash
-        run: echo "java openjdk64-11.0.2" > .tool-versions
+        run: echo "java openjdk64-17.0.10" > .tool-versions
      - name: setup-java
        uses: ./
        id: setup-java
@ -390,5 +390,5 @@ jobs:
          distribution: ${{ matrix.distribution }}
          java-version-file: ${{matrix.java-version-file }}
      - name: Verify Java
-        run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}"
+        run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}"
        shell: bash
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
--- a/src/cache.ts
+++ b/src/cache.ts
@ -58,7 +58,8 @@ const supportedPackageManager: PackageManager[] = [
      '**/*.sbt',
      '**/project/build.properties',
      '**/project/**.scala',
-      '**/project/**.sbt'
+      '**/project/**.sbt',
+      '!**/version.sbt' // releasing a new version of a library project shouldn't invalidate the entire sbt cache
    ]
  }
 ];
@ -92,13 +93,15 @@ async function computeCacheKey(
  const pattern = cacheDependencyPath
    ? cacheDependencyPath.trim().split('\n')
    : packageManager.pattern;
-  const fileHash = await glob.hashFiles(pattern.join('\n'));
+  const fileHash = await glob.hashFiles(pattern.join('\n'), undefined, undefined, true);
  if (!fileHash) {
    throw new Error(
      `No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`
    );
  }
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
+  const cacheKey = `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
+  core.info(`cacheKey is ${cacheKey}`);
+  return cacheKey;
 }

 /**
Author	SHA1	Message	Date
Roberto Tyley	ac97333c2e	Merge `ed3ab602f8` into `2e74cbce18`	2024-05-30 19:04:38 +05:30
HarithaVattikuti	2e74cbce18	Fix versions check failures (#634 ) * fix macos latest failures * fix failures	2024-05-22 10:26:50 -05:00
Roberto Tyley	ed3ab602f8	Is version.sbt still being included...	2024-02-22 15:57:56 +00:00
Roberto Tyley	f228ab54b9	Avoid sbt cache being invalidated for a library that is only incrementing it's own version While working on https://github.com/guardian/gha-scala-library-release-workflow I noticed that no matter how many times I ran the workflow, `actions/setup-java` would always report `sbt cache is not found`, even if there had been no substantial change in the project - simply that `version.sbt` (the file used by https://github.com/sbt/sbt-release) had the version number in it incremented (as in `b2152325ba`). This meant that turning on `cache: sbt` would actually slow the workflow considerably, as it would never benefit from the cache being present, and would always have to save it, which could take 2-3 minutes - even though it can't take advantage of the data it's saving. As such, it would be great to exclude `version.sbt` files from the cache hash key. Background: `cache: sbt` was orginally introduced with https://github.com/actions/setup-java/pull/302	2023-12-07 12:06:46 +00:00