From 341c11e50d6bfabd73e9ab19727f0f2ceb1555d5 Mon Sep 17 00:00:00 2001 From: Marjan Kalanaki Date: Tue, 7 Jan 2025 17:21:46 +0000 Subject: [PATCH 1/3] update content-api-models to 26.0.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1042497..f4cd03e 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion val contentEntityVersion = "3.0.3" val contentAtomVersion = "4.0.4" val storyPackageVersion = "2.2.0" -val contentApiModelsVersion = "25.1.1" +val contentApiModelsVersion = "26.0.0" val scroogeDependencies = Seq( "content-api-models", From 6e4f988c7bb08eb04a02fb9715a27effd96adc6f Mon Sep 17 00:00:00 2001 From: Marjan Kalanaki Date: Wed, 8 Jan 2025 16:47:34 +0000 Subject: [PATCH 2/3] install sbt before renning it in release workflow --- .github/workflows/release.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 19b9295..6f8b6a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,16 @@ jobs: with: node-version-file: .nvmrc registry-url: https://registry.npmjs.org + - name: Install sbt + run: | + sudo apt-get update + sudo apt-get install apt-transport-https curl gnupg -yqq + echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list + echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list + curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo -H gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import + sudo chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg + sudo apt-get update + sudo apt-get install sbt - name: Release Typescript to NPM run: | sbt "project tsApiModels" "releaseNpm ${{ needs.scala-maven-release.outputs.RELEASE_VERSION }}" From e44500317ca8755d5c7d019cc5a6fc46d83f9cff Mon Sep 17 00:00:00 2001 From: Marjan Kalanaki Date: Fri, 10 Jan 2025 11:52:47 +0000 Subject: [PATCH 3/3] add setup-sbt action instead of manually install sbt --- .github/workflows/release.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f8b6a6..1f45029 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,16 +28,7 @@ jobs: with: node-version-file: .nvmrc registry-url: https://registry.npmjs.org - - name: Install sbt - run: | - sudo apt-get update - sudo apt-get install apt-transport-https curl gnupg -yqq - echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list - echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list - curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo -H gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import - sudo chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg - sudo apt-get update - sudo apt-get install sbt + - uses: sbt/setup-sbt@v1.1.0 - name: Release Typescript to NPM run: | sbt "project tsApiModels" "releaseNpm ${{ needs.scala-maven-release.outputs.RELEASE_VERSION }}"