From c27b46d0df29199918c01f9905deab3e6dc1a03a Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 11:27:28 -0800 Subject: [PATCH 01/16] upgrade cache gha to v4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e8e5648..2405ab22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: distribution: 'adopt' - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.sbt From 5a67b114cddb0127a53caacbe5cf64b3ef0854c4 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 11:45:35 -0800 Subject: [PATCH 02/16] manually add sbt --- .github/workflows/ci.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2405ab22..183daa4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,16 +21,22 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' + cache: sbt + + - uses: sbt/setup-sbt@v1 + - name: Build and test + shell: bash + run: sbt -v +test - name: Cache sbt uses: actions/cache@v4 From 5b3ab519a7d9f70be84ae512caae56601fdb1a3f Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 11:51:52 -0800 Subject: [PATCH 03/16] remove sbt test --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 183daa4b..41548921 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,9 +34,6 @@ jobs: cache: sbt - uses: sbt/setup-sbt@v1 - - name: Build and test - shell: bash - run: sbt -v +test - name: Cache sbt uses: actions/cache@v4 From 6fe2f0d547a6767e050625066df554e8428f4935 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 11:58:35 -0800 Subject: [PATCH 04/16] cache sbt --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41548921..0a20eb2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: java-version: '11' distribution: 'adopt' - cache: sbt + cache: 'sbt' - uses: sbt/setup-sbt@v1 From 934707aae155c879f79196618083f9cab59d4921 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 12:04:47 -0800 Subject: [PATCH 05/16] revert to old ubuntu --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a20eb2e..94fdf298 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: name: Build and Test strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [adopt@1.11] runs-on: ${{ matrix.os }} @@ -27,16 +27,14 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: '11' distribution: 'adopt' cache: 'sbt' - - uses: sbt/setup-sbt@v1 - - name: Cache sbt - uses: actions/cache@v4 + uses: actions/cache@v2 with: path: | ~/.sbt From cc1e224bbaa6112777c0cbc2e0b163944e628dcb Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 12:06:15 -0800 Subject: [PATCH 06/16] revert to old ubuntu --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94fdf298..3defe955 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,6 @@ jobs: with: java-version: '11' distribution: 'adopt' - cache: 'sbt' - name: Cache sbt uses: actions/cache@v2 From 318c4aa172d6bfe039e3bc5357e71910b719b0b8 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 12:10:08 -0800 Subject: [PATCH 07/16] revert to old ubuntu --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3defe955..7e16c87e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,11 +21,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: fetch-depth: 0 - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up JDK 11 uses: actions/setup-java@v2 with: @@ -45,5 +45,4 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Validation - run: sbt validate - + run: sbt validate \ No newline at end of file From 4fa4aa4e627031ae0ceb8b994b959621d92dc915 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 12:17:02 -0800 Subject: [PATCH 08/16] test commands --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e16c87e..869befa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,5 +44,11 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: docker test + run: docker-compose --version + + - name: all env commands + run: compgen -c | sort | uniq + - name: Validation run: sbt validate \ No newline at end of file From 01086c065774854b22210571bfffae2d1987f8cb Mon Sep 17 00:00:00 2001 From: tonyliu Date: Thu, 16 Jan 2025 12:18:34 -0800 Subject: [PATCH 09/16] test commands --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 869befa5..01f91c5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,11 +44,11 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: docker test - run: docker-compose --version - - name: all env commands run: compgen -c | sort | uniq + - name: docker test + run: docker-compose --version + - name: Validation run: sbt validate \ No newline at end of file From 29845cde6552c2f31b9c01d670c0cb8a6230b7f5 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Fri, 17 Jan 2025 09:15:38 -0800 Subject: [PATCH 10/16] user docker compose in place of docker-compose --- .github/workflows/ci.yml | 10 ++-------- build.sbt | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01f91c5d..4d4cf748 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: name: Build and Test strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] java: [adopt@1.11] runs-on: ${{ matrix.os }} @@ -44,11 +44,5 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: all env commands - run: compgen -c | sort | uniq - - - name: docker test - run: docker-compose --version - - name: Validation - run: sbt validate \ No newline at end of file + run: sbt validate diff --git a/build.sbt b/build.sbt index c0152dfe..37023e63 100644 --- a/build.sbt +++ b/build.sbt @@ -418,7 +418,7 @@ def dockerCompose( env: String = "" ) = { val upCommand = if (upOrDown) "up -d" else "down" - s"docker-compose --env-file ./.env$env $upCommand" ! + s"docker compose --env-file ./.env$env $upCommand" ! } lazy val noPublishing = Seq(publish / skip := true) From 25c7ba39870122fae71a6f99f1e6046fbd4c4e58 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Fri, 17 Jan 2025 09:21:47 -0800 Subject: [PATCH 11/16] set up sbt --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d4cf748..e89fc69d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,17 +21,19 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4s with: java-version: '11' distribution: 'adopt' + - name: Set up sbt + uses: sbt/setup-sbt@v1 + - name: Cache sbt uses: actions/cache@v2 with: From 3875b67728a331458d6773400d34596dfe9c8693 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Fri, 17 Jan 2025 09:24:42 -0800 Subject: [PATCH 12/16] inspect cache --- .github/workflows/ci.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e89fc69d..07c97163 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: fetch-depth: 0 - name: Set up JDK 11 - uses: actions/setup-java@v4s + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' @@ -34,8 +34,17 @@ jobs: - name: Set up sbt uses: sbt/setup-sbt@v1 + - name: LS + run: | + ls ~/.sbt + ls ~/.ivy2/cache + ls ~/.coursier/cache/v1 + ls ~/.cache/coursier/v1 + ls ~/AppData/Local/Coursier/Cache/v1 + ls ~/Library/Caches/Coursier/v1 + - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.sbt @@ -44,7 +53,7 @@ jobs: ~/.cache/coursier/v1 ~/AppData/Local/Coursier/Cache/v1 ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + key: ${{ runner.os }}-sbt-cache-v4-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Validation run: sbt validate From 1a190b80d71099303953919a3d41f3f2dcfed5e6 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Fri, 17 Jan 2025 09:43:05 -0800 Subject: [PATCH 13/16] suppress bad ls --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07c97163..ced3c7d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,12 +36,12 @@ jobs: - name: LS run: | - ls ~/.sbt - ls ~/.ivy2/cache - ls ~/.coursier/cache/v1 - ls ~/.cache/coursier/v1 - ls ~/AppData/Local/Coursier/Cache/v1 - ls ~/Library/Caches/Coursier/v1 + ls ~/.sbt || true + ls ~/.ivy2/cache || true + ls ~/.coursier/cache/v1 || true + ls ~/.cache/coursier/v1 || true + ls ~/AppData/Local/Coursier/Cache/v1 || true + ls ~/Library/Caches/Coursier/v1 || true - name: Cache sbt uses: actions/cache@v4 From d62d41e9f40d3d408db47abc264e850a58a3f6b4 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Fri, 17 Jan 2025 09:49:58 -0800 Subject: [PATCH 14/16] cache later --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ced3c7d9..67ae14c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,9 @@ jobs: - name: Set up sbt uses: sbt/setup-sbt@v1 + - name: Validation + run: sbt validate + - name: LS run: | ls ~/.sbt || true @@ -54,6 +57,3 @@ jobs: ~/AppData/Local/Coursier/Cache/v1 ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v4-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - - name: Validation - run: sbt validate From 12cbeb0aa5c0d366b24898ab1caee1b9a5d1b3d9 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Fri, 17 Jan 2025 10:31:13 -0800 Subject: [PATCH 15/16] more ls --- .github/workflows/ci.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67ae14c8..d1493eb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,11 +39,19 @@ jobs: - name: LS run: | + ll -h ~/ || true ls ~/.sbt || true - ls ~/.ivy2/cache || true - ls ~/.coursier/cache/v1 || true - ls ~/.cache/coursier/v1 || true - ls ~/AppData/Local/Coursier/Cache/v1 || true + ls ~/.ivy2/ || true + ls ~/.coursier/ || true + ls ~/.coursier/cache/ || true + ls ~/.cache/ || true + ls ~/.cache/coursier/ || true + ls ~/AppData/ || true + ls ~/AppData/Local/ || true + ls ~/AppData/Local/Coursier/ || true + ls ~/AppData/Local/Coursier/Cache/ || true + ls ~/Library/Caches/ || true + ls ~/Library/Caches/Coursier/ || true ls ~/Library/Caches/Coursier/v1 || true - name: Cache sbt From f58284457336206ca5c69e35a8589836752c07b4 Mon Sep 17 00:00:00 2001 From: tonyliu Date: Fri, 17 Jan 2025 10:41:02 -0800 Subject: [PATCH 16/16] clean up ci.yml --- .github/workflows/ci.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1493eb3..abf8ab5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,31 +37,10 @@ jobs: - name: Validation run: sbt validate - - name: LS - run: | - ll -h ~/ || true - ls ~/.sbt || true - ls ~/.ivy2/ || true - ls ~/.coursier/ || true - ls ~/.coursier/cache/ || true - ls ~/.cache/ || true - ls ~/.cache/coursier/ || true - ls ~/AppData/ || true - ls ~/AppData/Local/ || true - ls ~/AppData/Local/Coursier/ || true - ls ~/AppData/Local/Coursier/Cache/ || true - ls ~/Library/Caches/ || true - ls ~/Library/Caches/Coursier/ || true - ls ~/Library/Caches/Coursier/v1 || true - - name: Cache sbt uses: actions/cache@v4 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-v4-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}