Merge pull request #1351 from eikek/nix-refactor

Nix refactor and build update

.github/workflows/ci.yml

@@ -3,40 +3,27 @@ on:
   pull_request:
 jobs:
   nix-build:
+    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v25
-      - run: nix build
+      - uses: cachix/install-nix-action@v26
+      - run: nix build .#sharry-dev
   ci-matrix:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        java: [ '[email protected]' ]
     steps:
       - uses: actions/[email protected]
         with:
           fetch-depth: 100
-      - uses: jorelali/setup-elm@v5
-        with:
-          elm-version: 0.19.1
-      - uses: bahmutov/npm-install@v1
-        with:
-          working-directory: modules/webapp
-      - uses: cachix/install-nix-action@v25
-      - name: Install tailwindcss cli
-        run: |
-          nix profile install nixpkgs#tailwindcss
+      - uses: cachix/install-nix-action@v26
       - name: Fetch tags
         run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
-      - uses: olafurpg/setup-scala@v14
-        with:
-          java-version: ${{ matrix.java }}
       - name: Coursier cache
         uses: coursier/cache-action@v6
       - name: sbt ci ${{ github.ref }}
-        run: sbt ci
+        run: nix develop .#ci --command sbt ci
   ci:
     runs-on: ubuntu-22.04
     needs: [ci-matrix]

.github/workflows/release-nightly.yml

@@ -8,33 +8,19 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
-      matrix:
-        java: [ '[email protected]' ]
     steps:
       - uses: actions/[email protected]
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v14
-        with:
-          java-version: ${{ matrix.java }}
-      - uses: jorelali/setup-elm@v5
-        with:
-          elm-version: 0.19.1
-      - uses: bahmutov/npm-install@v1
-        with:
-          working-directory: modules/webapp
-      - uses: cachix/install-nix-action@v25
-      - name: Install tailwindcss cli
-        run: |
-          nix profile install nixpkgs#tailwindcss
+      - uses: cachix/install-nix-action@v26
       - name: Coursier cache
         uses: coursier/cache-action@v6
       - name: Set current version
         run:  echo "SHARRY_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
       - name: sbt ci ${{ github.ref }}
-        run: sbt ci
+        run: nix develop .#ci --command sbt ci
       - name: sbt make-pkg (${{ env.SHARRY_VERSION }})
-        run: sbt make-pkg
+        run: nix develop .#ci --command sbt make-pkg
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/release.yml

@@ -8,27 +8,16 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
-      matrix:
-        java: [ '[email protected]' ]
     steps:
       - uses: actions/[email protected]
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v14
-        with:
-          java-version: ${{ matrix.java }}
-      - uses: jorelali/setup-elm@v5
-        with:
-          elm-version: 0.19.1
-      - uses: bahmutov/npm-install@v1
-        with:
-          working-directory: modules/webapp
       - name: Coursier cache
         uses: coursier/cache-action@v6
       - name: Set current version
         run:  echo "SHARRY_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
       - name: sbt make-pkg (${{ env.SHARRY_VERSION }})
-        run: sbt make-pkg
+        run: nix develop .#ci --command sbt make-pkg
       - uses: meeDamian/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/website.yml

@@ -12,13 +12,9 @@ jobs:
           fetch-depth: 0
       - name: Set current version
         run:  echo "SHARRY_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
-      - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
-        with:
-          nix_path: nixpkgs=channel:nixos-21.05
-      - name: Print nixpkgs version
-        run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
+      - uses: cachix/install-nix-action@26
       - name: Build website (${{ env.SHARRY_VERSION }})
-        run: nix-shell project/microsite.nix --run "sbt microsite/makeMicrosite"
+        run: nix develop .#ci --command sbt microsite/makeMicrosite
       - name: Publish website (${{ env.SHARRY_VERSION }})
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.sbt

@@ -8,8 +8,7 @@ val webjarSkip = settingKey[Boolean]("Skip copying webjar files")
 
 val scalafixSettings = Seq(
   semanticdbEnabled := true, // enable SemanticDB
-  semanticdbVersion := scalafixSemanticdb.revision, // "4.4.0"
-  ThisBuild / scalafixDependencies ++= Dependencies.organizeImports
+  semanticdbVersion := scalafixSemanticdb.revision
 )
 
 val sharedSettings = Seq(
@@ -192,6 +191,10 @@ val restapi = project
     openapiPackage := Pkg("sharry.restapi.model"),
     openapiSpec := (Compile / resourceDirectory).value / "sharry-openapi.yml",
     openapiStaticGen := OpenApiDocGenerator.Redoc,
+    openapiRedoclyCmd := Seq("redocly-cli"),
+    openapiRedoclyConfig := Some(
+      (LocalRootProject / baseDirectory).value / "project" / "redocly.yml"
+    ),
     openapiScalaConfig := ScalaConfig()
       .withJson(ScalaJson.circeSemiauto)
       .addMapping(CustomMapping.forType { case TypeDef("LocalDateTime", _) =>