Skip to content

Commit b172caa

Browse files
authored
Merge branch 'series/4.x' into update/zio-aws-ssm-7.28.29.11
2 parents 41174b8 + f2b642e commit b172caa

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Cache scala dependencies
2929
uses: coursier/cache-action@v6
3030
- name: Check Document Generation
31-
run: ./sbt docs/compileDocs
31+
run: sbt docs/compileDocs
3232

3333
lint:
3434
runs-on: ubuntu-22.04

.github/workflows/site.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ jobs:
2121
uses: actions/[email protected]
2222
with:
2323
fetch-depth: '0'
24-
- name: Setup Scala
24+
- name: Setup JVM
2525
uses: actions/[email protected]
2626
with:
2727
distribution: temurin
2828
java-version: 17
2929
check-latest: true
30+
- name: Setup SBT
31+
uses: sbt/setup-sbt@v1
3032
- name: Check website build process
31-
run: sbt docs/buildWebsite
33+
run: sbt docs/buildWebsite
3234
publish-docs:
3335
name: Publish Docs
3436
runs-on: ubuntu-latest
@@ -38,19 +40,21 @@ jobs:
3840
uses: actions/[email protected]
3941
with:
4042
fetch-depth: '0'
41-
- name: Setup Scala
43+
- name: Setup JVM
4244
uses: actions/[email protected]
4345
with:
4446
distribution: temurin
4547
java-version: 17
4648
check-latest: true
49+
- name: Setup SBT
50+
uses: sbt/setup-sbt@v1
4751
- name: Setup NodeJs
4852
uses: actions/setup-node@v3
4953
with:
5054
node-version: 16.x
5155
registry-url: https://registry.npmjs.org
5256
- name: Publish Docs to NPM Registry
53-
run: sbt docs/publishToNpm
57+
run: sbt docs/publishToNpm
5458
env:
5559
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
5660
generate-readme:
@@ -63,14 +67,16 @@ jobs:
6367
with:
6468
ref: ${{ github.head_ref }}
6569
fetch-depth: '0'
66-
- name: Setup Scala
70+
- name: Setup JVM
6771
uses: actions/[email protected]
6872
with:
6973
distribution: temurin
7074
java-version: 17
7175
check-latest: true
76+
- name: Setup SBT
77+
uses: sbt/setup-sbt@v1
7278
- name: Generate Readme
73-
run: sbt docs/generateReadme
79+
run: sbt docs/generateReadme
7480
- name: Commit Changes
7581
run: |
7682
git config --local user.email "github-actions[bot]@users.noreply.github.com"

magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import zio.Config.*
44
import zio.config.*
55
import zio.config.derivation.*
66
import zio.config.magnolia.DeriveConfig.*
7-
import zio.{Chunk, Config, LogLevel}
7+
import zio.{Chunk, Config, LogLevel, NonEmptyChunk}
88

99
import java.net.URI
1010
import java.time.{LocalDate, LocalDateTime, LocalTime, OffsetDateTime, *}

0 commit comments

Comments
 (0)