Skip to content

Commit

Permalink
Merge branch 'master' into prefix-error-msgs
Browse files Browse the repository at this point in the history
  • Loading branch information
@juliano
juliano authored Aug 18, 2023
2 parents f7f9cd6 + 30ebd2f commit bea6753
Show file tree
Hide file tree
Showing 849 changed files with 21,235 additions and 21,171 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.5
d8a77dfb017feae820e38eea0d7b5128b13a737d
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This template isn't a strict requirement to open issues, but please try to provi

### Steps to reproduce the behavior

If the issue can be reproduced using a [mirror context](http://getquill.io/#contexts-mirror-context), please provide a scastie snippet that reproduces it. See https://scastie.scala-lang.org/fwbrasil/Z2CeR2qHQJK6EyQWUBhANA as an example. Remember to select the correct Quill version in the left menu.
If the issue can be reproduced using a [mirror context](https://zio.dev/zio-quill/contexts#mirror-context), please provide a scastie snippet that reproduces it. See https://scastie.scala-lang.org/fwbrasil/Z2CeR2qHQJK6EyQWUBhANA as an example. Remember to select the correct Quill version in the left menu.

### Workaround

Expand Down
317 changes: 165 additions & 152 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Scala CI
name: CI

on:
push:
Expand All @@ -13,190 +13,203 @@ on:
- master

jobs:
secrets:
runs-on: ubuntu-latest
outputs:
secrets: ${{ steps.secrets.outputs.secrets }}
steps:
- name: secrets
id: secrets
env:
HAS_PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE != '' }}
HAS_ENCRYPTION_PASSWORD: ${{ secrets.ENCRYPTION_PASSWORD != '' }}
shell: bash
if: env.HAS_PGP_PASSPHRASE == 'true' && env.HAS_ENCRYPTION_PASSWORD == 'true'
run: echo ::set-output name=secrets::true
build:
runs-on: ubuntu-latest

env:
SCALA_VERSION: ${{ matrix.scala }}
POSTGRES_PASSWORD: postgres
MYSQL_PASSWORD: root

strategy:
matrix:
scala: [2.11.12, 2.12.10, 2.13.2, 3.2.0]
module: [base, db, js, async, codegen, bigdata]
include:
- scala: 2.11.12
scala_short: 211
scala_short_dot: 2.11
- scala: 2.12.10
scala_short: 212
scala_short_dot: 2.12
- scala: 2.13.2
scala_short: 213
scala_short_dot: 2.13
- scala: 3.2.0
scala_short: 30
scala_short_dot: 3.0
exclude:
# For now, only do the `base` build for Scala 3
- scala: 3.2.0
module: db
- scala: 3.2.0
module: js
- scala: 3.2.0
module: async
- scala: 3.2.0
module: codegen
- scala: 3.2.0
module: bigdata
# For other modules, `base` build is already included
- scala: 2.11.12
module: base
- scala: 2.12.10
module: base
- scala: 2.13.2
module: base
# Do not build 2.11 Scala JS anymore since various modules such as scala-collection-compat are missing for it
- scala: 2.11.12
module: js

name: Build ${{matrix.scala_short_dot}} - ${{matrix.module}}

steps:
- uses: actions/checkout@v2
- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.cache/coursier
~/.sbt
key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v10
with:
java-version: 1.8.0

- name: Build modules
run: |
export SCALA_VERSION=${{ matrix.scala }}
echo "SCALA_VERSION='$SCALA_VERSION'"
./build/build.sh ${{ matrix.module }}
runs-on: ubuntu-latest

env:
SCALA_VERSION: ${{ matrix.scala }}
POSTGRES_PASSWORD: postgres
MYSQL_PASSWORD: root

strategy:
fail-fast: false
matrix:
scala: [2.12.x, 2.13.x, 3.3.x]
module: [base, db, js, async, codegen, bigdata]
include:
- scala: 2.12.x
scala_short: 212
scala_short_dot: 2.12
- scala: 2.13.x
scala_short: 213
scala_short_dot: 2.13
- scala: 3.3.x
scala_short: 33
scala_short_dot: 3.3
exclude:
# For now, only do the `base` build for Scala 3
- scala: 3.3.x
module: db
- scala: 3.3.x
module: js
- scala: 3.3.x
module: async
- scala: 3.3.x
module: codegen
- scala: 3.3.x
module: bigdata
# For other modules, `base` build is already included
- scala: 2.12.x
module: base
- scala: 2.13.x
module: base

name: Build ${{matrix.scala_short_dot}} - ${{matrix.module}}

steps:
- uses: actions/checkout@v3
- name: Cache sbt
uses: actions/cache@v3
with:
path: |
~/.cache/coursier
~/.sbt
key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}

- name: Setup Java and Scala
uses: actions/setup-java@v3.10.0
with:
distribution: temurin
java-version: '8'
check-latest: true

- name: Build modules
run: |
echo "SCALA_VERSION='$SCALA_VERSION'"
./build/build.sh ${{ matrix.module }}
env:
SCALA_VERSION: ${{ matrix.scala }}

release:
if: ${{github.event_name != 'pull_request'}}
runs-on: ubuntu-latest

needs: build

strategy:
matrix:
scala: [2.11.12, 2.12.10, 2.13.2, 3.2.0]
module: [base, db, js, async, codegen, bigdata]
include:
- scala: 2.11.12
scala_short: 211
scala_short_dot: 2.11
- scala: 2.12.10
scala_short: 212
scala_short_dot: 2.12
- scala: 2.13.2
scala_short: 213
scala_short_dot: 2.13
- scala: 3.2.0
scala_short: 30
scala_short_dot: 3.0
exclude:
- scala: 3.2.0
module: db
- scala: 3.2.0
module: js
- scala: 3.2.0
module: async
- scala: 3.2.0
module: codegen
- scala: 3.2.0
module: bigdata
# Do not release 2.11 Scala JS anymore since various modules such as scala-collection-compat are missing for it
- scala: 2.11.12
module: js

name: Release ${{matrix.scala_short_dot}} - ${{matrix.module}}

steps:
- uses: actions/checkout@v2
- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.cache/coursier
~/.sbt
key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v10
with:
java-version: 1.8.0

- name: Release
run: |
export SCALA_VERSION=${{ matrix.scala }}
echo "SCALA_VERSION='$SCALA_VERSION'"
export PGP_PASSPHRASE=${{ secrets.PGP_PASSPHRASE }}
export PULL_REQUEST=${{ !!github.event.pull_request }}
echo "PULL_REQUEST='$PULL_REQUEST'"
export GITHUB_REF=${{ github.ref }}
echo "GITHUB_REF='$GITHUB_REF'"
export BRANCH=$(git for-each-ref ${{ github.ref }} --format='%(refname:short)')
echo "BRANCH='$BRANCH'"
./build/release.sh ${{ matrix.scala_short }} ${{ matrix.module }}
env:
ENCRYPTION_PASSWORD: ${{ secrets.ENCRYPTION_PASSWORD }}
if: ${{github.event_name != 'pull_request' && needs.secrets.outputs.secrets }}
runs-on: ubuntu-latest

needs:
- build
- secrets

strategy:
fail-fast: false
matrix:
scala: [2.12.x, 2.13.x, 3.3.x]
module: [docs, base, db, js, async, codegen, bigdata]
include:
- scala: 2.12.x
scala_short: 212
scala_short_dot: 2.12
- scala: 2.13.x
scala_short: 213
scala_short_dot: 2.13
- scala: 3.3.x
scala_short: 33
scala_short_dot: 3.3
exclude:
- scala: 3.3.x
module: db
- scala: 3.3.x
module: js
- scala: 3.3.x
module: async
- scala: 3.3.x
module: codegen
- scala: 3.3.x
module: bigdata

name: Release ${{matrix.scala_short_dot}} - ${{matrix.module}}

steps:
- uses: actions/checkout@v3
- name: Cache sbt
uses: actions/cache@v3
with:
path: |
~/.cache/coursier
~/.sbt
key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}

- name: Setup Java and Scala
uses: actions/setup-java@v3.10.0
with:
distribution: temurin
java-version: '8'
check-latest: true

- name: Release
run: |
echo "SCALA_VERSION='$SCALA_VERSION'"
echo "PULL_REQUEST='$PULL_REQUEST'"
echo "GITHUB_REF='$GITHUB_REF'"
export BRANCH=$(git for-each-ref ${{ github.ref }} --format='%(refname:short)')
echo "BRANCH='$BRANCH'"
./build/release.sh ${{ matrix.scala_short }} ${{ matrix.module }}
env:
ENCRYPTION_PASSWORD: ${{ secrets.ENCRYPTION_PASSWORD }}
GITHUB_REF: ${{ github.ref }}
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PULL_REQUEST: ${{ !!github.event.pull_request }}
SCALA_VERSION: ${{ matrix.scala }}

publish:
if: ${{github.event_name != 'pull_request'}}
if: ${{github.event_name != 'pull_request' && needs.secrets.outputs.secrets }}
runs-on: ubuntu-latest

needs: release
needs:
- release
- secrets

strategy:
fail-fast: false
matrix:
scala: [2.12.10]
scala: [2.13.x]
module: [publish]
include:
- scala: 2.12.10
scala_short: 212
scala_short_dot: 2.12
- scala: 2.13.x
scala_short: 213
scala_short_dot: 2.13

name: Publish ${{matrix.scala_short_dot}} - ${{matrix.module}}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Cache sbt
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cache/coursier
~/.sbt
key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v10
uses: actions/setup-java@v3.10.0
with:
java-version: 1.8.0
distribution: temurin
java-version: '8'
check-latest: true

- name: Release
run: |
export SCALA_VERSION=${{ matrix.scala }}
echo "SCALA_VERSION='$SCALA_VERSION'"
export PGP_PASSPHRASE=${{ secrets.PGP_PASSPHRASE }}
export PULL_REQUEST=${{ !!github.event.pull_request }}
echo "PULL_REQUEST='$PULL_REQUEST'"
export GITHUB_REF=${{ github.ref }}
echo "GITHUB_REF='$GITHUB_REF'"
export BRANCH=$(git for-each-ref ${{ github.ref }} --format='%(refname:short)')
echo "BRANCH='$BRANCH'"
./build/release.sh ${{ matrix.scala_short }} ${{ matrix.module }}
env:
ENCRYPTION_PASSWORD: ${{ secrets.ENCRYPTION_PASSWORD }}
GITHUB_REF: ${{ github.ref }}
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PULL_REQUEST: ${{ !!github.event.pull_request }}
SCALA_VERSION: ${{ matrix.scala }}
Loading

0 comments on commit bea6753

Please sign in to comment.