From b33830318d081b7b5765ce20b55c4dd2af86ba9e Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:14:36 +0100 Subject: [PATCH 01/10] ci: naive GH workflow --- .github/workflows/check-build-test.yml | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/check-build-test.yml diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml new file mode 100644 index 0000000..ab1665a --- /dev/null +++ b/.github/workflows/check-build-test.yml @@ -0,0 +1,46 @@ +name: CI + +on: + pull_request: + push: + branches: + - develop + - master + - main + - release-* + tags-ignore: [ v.* ] + +permissions: + contents: read + +jobs: + test: + name: Build and Test + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + include: + - { jvmName: "temurin:1.8.0" } + # { jvmName: "temurin:1.11.0" } + # { jvmName: "temurin:1.17.0" } + steps: + - name: Checkout + uses: actions/checkout@v3.1.0 + + - name: Cache Coursier cache + uses: coursier/cache-action@v6.4.1 + + - name: Set up JDK ${{ matrix.jvmName }} + uses: coursier/setup-action@v1.3.0 + with: + jvm: ${{ matrix.jvmName }} + + - name: Intall Jekyll, Nanoc, Asciidoctor, Gitbook + run: |- + gem install jekyll:3.8.4 nanoc:4.0.2 asciidoctor --no-document + npm install -g gitbook-cli@2.3.2 + gitbook install 3.2.3 + + - name: sbt test + run: sbt "^^$SBT_CROSS_VERSION; compile; runScriptedTest; makeSite" From ffe299799443d85443144d8d97377d2faf695cc9 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:23:20 +0100 Subject: [PATCH 02/10] sudo --- .github/workflows/check-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index ab1665a..a3d907d 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -38,7 +38,7 @@ jobs: - name: Intall Jekyll, Nanoc, Asciidoctor, Gitbook run: |- - gem install jekyll:3.8.4 nanoc:4.0.2 asciidoctor --no-document + sudo gem install jekyll:3.8.4 nanoc:4.0.2 asciidoctor --no-document npm install -g gitbook-cli@2.3.2 gitbook install 3.2.3 From 42a59c924ab8038ac0f06372a8975c97a68a3e5b Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:27:21 +0100 Subject: [PATCH 03/10] Ignore gitbook for now --- .github/workflows/check-build-test.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index a3d907d..9330431 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: include: - - { jvmName: "temurin:1.8.0" } + - { sbtCrossVersion: "1.6.0", jvmName: "temurin:1.8.0" } # { jvmName: "temurin:1.11.0" } # { jvmName: "temurin:1.17.0" } steps: @@ -31,16 +31,24 @@ jobs: - name: Cache Coursier cache uses: coursier/cache-action@v6.4.1 + - name: Ruby caches + uses: actions/cache@v2 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} + restore-keys: | + ${{ runner.os }}-gems- + - name: Set up JDK ${{ matrix.jvmName }} uses: coursier/setup-action@v1.3.0 with: jvm: ${{ matrix.jvmName }} - - name: Intall Jekyll, Nanoc, Asciidoctor, Gitbook + - name: Install Jekyll, Nanoc, Asciidoctor run: |- sudo gem install jekyll:3.8.4 nanoc:4.0.2 asciidoctor --no-document - npm install -g gitbook-cli@2.3.2 - gitbook install 3.2.3 +# npm install -g gitbook-cli@2.3.2 +# gitbook install 3.2.3 - name: sbt test - run: sbt "^^$SBT_CROSS_VERSION; compile; runScriptedTest; makeSite" + run: sbt "^^${{ sbtCrossVersion }}; compile; runScriptedTest; makeSite" From e8e6f8d522f1a859f1135824c3a0c1078a2b8473 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:29:34 +0100 Subject: [PATCH 04/10] cross version --- .github/workflows/check-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 9330431..1f36302 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -51,4 +51,4 @@ jobs: # gitbook install 3.2.3 - name: sbt test - run: sbt "^^${{ sbtCrossVersion }}; compile; runScriptedTest; makeSite" + run: sbt "^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" From 6953012ff1f29c072172c44bd9bd006830ddd81e Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:35:13 +0100 Subject: [PATCH 05/10] semicolon --- .github/workflows/check-build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 1f36302..5d3eec5 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: include: - - { sbtCrossVersion: "1.6.0", jvmName: "temurin:1.8.0" } + - { sbtCrossVersion: "1.1.6", jvmName: "temurin:1.8.0" } # { jvmName: "temurin:1.11.0" } # { jvmName: "temurin:1.17.0" } steps: @@ -51,4 +51,4 @@ jobs: # gitbook install 3.2.3 - name: sbt test - run: sbt "^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" + run: sbt ";^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" From de8f7664ea44a2f80e7bb7df629029bca371b3c1 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:49:36 +0100 Subject: [PATCH 06/10] Install an ancient Hugo version --- .github/workflows/check-build-test.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 5d3eec5..cea214b 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -32,7 +32,7 @@ jobs: uses: coursier/cache-action@v6.4.1 - name: Ruby caches - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: vendor/bundle key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} @@ -50,5 +50,14 @@ jobs: # npm install -g gitbook-cli@2.3.2 # gitbook install 3.2.3 + - name: Install Hugo 0.20 + run: |- + mkdir download + wget https://github.com/spf13/hugo/releases/download/v0.20.1/hugo_0.20.1_linux-64bit.tar.gz -O download/hugo.tgz + tar xvf download/hugo.tgz + mv hugo_0.20.1_linux_amd64/hugo_0.20.1_linux_amd64 $HOME/bin/hugo + chmod +x $HOME/bin/hugo + rm -rf download/ + - name: sbt test run: sbt ";^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" From 61b5140ea2ac374e76aa5832feec71bfe233529b Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:54:53 +0100 Subject: [PATCH 07/10] hugo bin --- .github/workflows/check-build-test.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index cea214b..46cb158 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -55,9 +55,13 @@ jobs: mkdir download wget https://github.com/spf13/hugo/releases/download/v0.20.1/hugo_0.20.1_linux-64bit.tar.gz -O download/hugo.tgz tar xvf download/hugo.tgz - mv hugo_0.20.1_linux_amd64/hugo_0.20.1_linux_amd64 $HOME/bin/hugo - chmod +x $HOME/bin/hugo - rm -rf download/ + mkdir ${PWD}/bin + export PATH=${PATH}:${PWD}/bin + mv hugo_0.20.1_linux_amd64/hugo_0.20.1_linux_amd64 ${PWD}/bin/hugo + chmod +x ${PWD}/bin/hugo + + - name: asciidoctor + run: sbt ";^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" - name: sbt test run: sbt ";^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" From 0a48d761c1f4dcc544e2fba6503e864611dadd2d Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:10:04 +0100 Subject: [PATCH 08/10] Ignore failing tool integrations --- .github/workflows/check-build-test.yml | 14 ++++++++------ src/sbt-test/gitbook/can-manage-installation/test | 5 +++-- src/sbt-test/gitbook/can-use-gitbook/test | 5 +++-- src/sbt-test/gitbook/ignore-dot-files/test | 5 +++-- src/sbt-test/hugo/can-use-hugo/test | 5 +++-- src/sbt-test/jekyll/can-use-jekyll/test | 5 +++-- src/sbt-test/site/plays-nice-with-ghpages/test | 5 +++-- src/sbt-test/site/plays-nice-with-tut/test | 5 +++-- src/sbt-test/sphinx/can-use-sphinx/test | 5 +++-- 9 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 46cb158..c8132cf 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -31,6 +31,11 @@ jobs: - name: Cache Coursier cache uses: coursier/cache-action@v6.4.1 + - name: Install Node + uses: actions/setup-node@v1 + with: + node-version: v16.x + - name: Ruby caches uses: actions/cache@v3 with: @@ -47,21 +52,18 @@ jobs: - name: Install Jekyll, Nanoc, Asciidoctor run: |- sudo gem install jekyll:3.8.4 nanoc:4.0.2 asciidoctor --no-document -# npm install -g gitbook-cli@2.3.2 -# gitbook install 3.2.3 + npm install -g gitbook-cli@2.3.2 + gitbook install 3.2.3 - name: Install Hugo 0.20 run: |- mkdir download - wget https://github.com/spf13/hugo/releases/download/v0.20.1/hugo_0.20.1_linux-64bit.tar.gz -O download/hugo.tgz + wget https://github.com/gohugoio/hugo/releases/download/v0.20.1/hugo_0.20.1_linux-64bit.tar.gz -O download/hugo.tgz tar xvf download/hugo.tgz mkdir ${PWD}/bin export PATH=${PATH}:${PWD}/bin mv hugo_0.20.1_linux_amd64/hugo_0.20.1_linux_amd64 ${PWD}/bin/hugo chmod +x ${PWD}/bin/hugo - - name: asciidoctor - run: sbt ";^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" - - name: sbt test run: sbt ";^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" diff --git a/src/sbt-test/gitbook/can-manage-installation/test b/src/sbt-test/gitbook/can-manage-installation/test index 9f9a269..1274d4b 100644 --- a/src/sbt-test/gitbook/can-manage-installation/test +++ b/src/sbt-test/gitbook/can-manage-installation/test @@ -1,2 +1,3 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent diff --git a/src/sbt-test/gitbook/can-use-gitbook/test b/src/sbt-test/gitbook/can-use-gitbook/test index 9f9a269..1274d4b 100644 --- a/src/sbt-test/gitbook/can-use-gitbook/test +++ b/src/sbt-test/gitbook/can-use-gitbook/test @@ -1,2 +1,3 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent diff --git a/src/sbt-test/gitbook/ignore-dot-files/test b/src/sbt-test/gitbook/ignore-dot-files/test index 9f9a269..1274d4b 100644 --- a/src/sbt-test/gitbook/ignore-dot-files/test +++ b/src/sbt-test/gitbook/ignore-dot-files/test @@ -1,2 +1,3 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent diff --git a/src/sbt-test/hugo/can-use-hugo/test b/src/sbt-test/hugo/can-use-hugo/test index 9f9a269..1274d4b 100644 --- a/src/sbt-test/hugo/can-use-hugo/test +++ b/src/sbt-test/hugo/can-use-hugo/test @@ -1,2 +1,3 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent diff --git a/src/sbt-test/jekyll/can-use-jekyll/test b/src/sbt-test/jekyll/can-use-jekyll/test index 0d0923d..24a4fe4 100644 --- a/src/sbt-test/jekyll/can-use-jekyll/test +++ b/src/sbt-test/jekyll/can-use-jekyll/test @@ -1,3 +1,4 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent diff --git a/src/sbt-test/site/plays-nice-with-ghpages/test b/src/sbt-test/site/plays-nice-with-ghpages/test index 9f9a269..1274d4b 100644 --- a/src/sbt-test/site/plays-nice-with-ghpages/test +++ b/src/sbt-test/site/plays-nice-with-ghpages/test @@ -1,2 +1,3 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent diff --git a/src/sbt-test/site/plays-nice-with-tut/test b/src/sbt-test/site/plays-nice-with-tut/test index 9f9a269..1274d4b 100644 --- a/src/sbt-test/site/plays-nice-with-tut/test +++ b/src/sbt-test/site/plays-nice-with-tut/test @@ -1,2 +1,3 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent diff --git a/src/sbt-test/sphinx/can-use-sphinx/test b/src/sbt-test/sphinx/can-use-sphinx/test index 9f9a269..1274d4b 100644 --- a/src/sbt-test/sphinx/can-use-sphinx/test +++ b/src/sbt-test/sphinx/can-use-sphinx/test @@ -1,2 +1,3 @@ -> makeSite -> checkContent +# 2022-12-16 ennru: Ignore in GH workflow +# > makeSite +# > checkContent From 86dd9d56be0f256675ff7d1c8b58906334d50fa9 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:14:00 +0100 Subject: [PATCH 09/10] Ignore gitbook --- .github/workflows/check-build-test.yml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index c8132cf..4f3ee5f 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -31,10 +31,10 @@ jobs: - name: Cache Coursier cache uses: coursier/cache-action@v6.4.1 - - name: Install Node - uses: actions/setup-node@v1 - with: - node-version: v16.x +# - name: Install Node +# uses: actions/setup-node@v1 +# with: +# node-version: v16.x - name: Ruby caches uses: actions/cache@v3 @@ -52,18 +52,18 @@ jobs: - name: Install Jekyll, Nanoc, Asciidoctor run: |- sudo gem install jekyll:3.8.4 nanoc:4.0.2 asciidoctor --no-document - npm install -g gitbook-cli@2.3.2 - gitbook install 3.2.3 +# npm install -g gitbook-cli@2.3.2 +# gitbook install 3.2.3 - - name: Install Hugo 0.20 - run: |- - mkdir download - wget https://github.com/gohugoio/hugo/releases/download/v0.20.1/hugo_0.20.1_linux-64bit.tar.gz -O download/hugo.tgz - tar xvf download/hugo.tgz - mkdir ${PWD}/bin - export PATH=${PATH}:${PWD}/bin - mv hugo_0.20.1_linux_amd64/hugo_0.20.1_linux_amd64 ${PWD}/bin/hugo - chmod +x ${PWD}/bin/hugo +# - name: Install Hugo 0.20 +# run: |- +# mkdir download +# wget https://github.com/gohugoio/hugo/releases/download/v0.20.1/hugo_0.20.1_linux-64bit.tar.gz -O download/hugo.tgz +# tar xvf download/hugo.tgz +# mkdir ${PWD}/bin +# export PATH=${PATH}:${PWD}/bin +# mv hugo_0.20.1_linux_amd64/hugo_0.20.1_linux_amd64 ${PWD}/bin/hugo +# chmod +x ${PWD}/bin/hugo - name: sbt test run: sbt ";^^${{ matrix.sbtCrossVersion }}; compile; runScriptedTest; makeSite" From 296356c015fe1fe83031cbe160b605e05ff09b39 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:29:16 +0100 Subject: [PATCH 10/10] Remove Bintray references --- .travis.yml | 3 +++ README.md | 4 ---- project/plugins.sbt | 1 - release.sbt | 10 +++++----- src/main/paradox/notes/release-process.md | 2 ++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index b62ff77..19f479d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +This project does not use Travis anymore, see .github/workflows instead. +This file is kept only to remember how things were set up until all parts work again. + dist: xenial jdk: openjdk8 language: scala diff --git a/README.md b/README.md index 1d54b4d..7095fca 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # sbt-site -[![Build Status](https://travis-ci.com/sbt/sbt-site.svg)](https://travis-ci.com/sbt/sbt-site) -[![Join the chat at https://gitter.im/sbt/sbt-site](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sbt/sbt-site) -[ ![Download](https://api.bintray.com/packages/sbt/sbt-plugin-releases/sbt-site/images/download.svg) ](https://bintray.com/sbt/sbt-plugin-releases/sbt-site-imported/_latestVersion) - This sbt plugin generates project websites from static content, [Jekyll], [Sphinx], [Pamflet], [Nanoc], [GitBook], [Paradox], [Hugo], [Laika] and/or [Asciidoctor], and can optionally include generated Scaladoc. It is designed to work hand-in-hand with publishing plugins like [sbt-ghpages]. ## Documentation diff --git a/project/plugins.sbt b/project/plugins.sbt index 4bd05a7..b1a108b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,3 @@ -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.5") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0") //#sbt-ghpages addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") diff --git a/release.sbt b/release.sbt index 8400354..d6bcfb3 100644 --- a/release.sbt +++ b/release.sbt @@ -1,7 +1,7 @@ publishMavenStyle := false -bintrayOrganization := Some("sbt") - -bintrayRepository := "sbt-plugin-releases" - -bintrayReleaseOnPublish in ThisBuild := false +//bintrayOrganization := Some("sbt") +// +//bintrayRepository := "sbt-plugin-releases" +// +//ThisBuild / bintrayReleaseOnPublish := false diff --git a/src/main/paradox/notes/release-process.md b/src/main/paradox/notes/release-process.md index 283c5f5..5738878 100644 --- a/src/main/paradox/notes/release-process.md +++ b/src/main/paradox/notes/release-process.md @@ -13,6 +13,8 @@ frontend which includes support for GitFlow. The images below are taken from Sou ## Release +This needs to be renovated to work without Bintray, e.g. with sbt-ci-release + 0. Make sure you have [BinTray](https://bintray.com/sbt) credentials for the "sbt" organization. You won't be able to publish without them. 1. Make sure the working directory is clean and up-to-date with the remote, and the tests pass (e.g. `sbt scripted`).