Skip to content

Commit

Permalink
Fix a merge error and regenerate actions (#1177)
Browse files Browse the repository at this point in the history
Fixes a merge error in #1167, executed `sbt ciGenerateGithubWorkflow` to regenerate GitHub actions.
  • Loading branch information
erikvanoosten authored Feb 28, 2024
1 parent ffc24cf commit ac0fadd
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 20 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ jobs:
continue-on-error: true
steps:
- name: Git Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
uses: coursier/cache-action@v6.4.4
- name: Check all code compiles
run: sbt +Test/compile
- name: Check artifacts build process
Expand All @@ -48,19 +48,19 @@ jobs:
continue-on-error: false
steps:
- name: Git Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
uses: coursier/cache-action@v6.4.4
- name: Check if the site workflow is up to date
run: sbt ciCheckGithubWorkflow
- name: Lint
Expand All @@ -80,15 +80,15 @@ jobs:
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: corretto
java-version: ${{ matrix.java }}
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
uses: coursier/cache-action@v6.4.4
- name: Git Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: '0'
- name: Test
Expand All @@ -100,19 +100,19 @@ jobs:
if: ${{ github.event_name == 'push' }}
steps:
- name: Git Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
uses: coursier/cache-action@v6.4.4
- name: Generate Readme
run: sbt docs/generateReadme
- name: Commit Changes
Expand Down Expand Up @@ -174,19 +174,19 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Git Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
uses: coursier/cache-action@v6.4.4
- name: Release
run: sbt ci-release
env:
Expand All @@ -203,21 +203,21 @@ jobs:
if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
steps:
- name: Git Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
uses: coursier/cache-action@v6.4.4
- name: Setup NodeJs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
registry-url: https://registry.npmjs.org
Expand All @@ -234,7 +234,7 @@ jobs:
if: ${{ (github.event_name == 'release') && (github.event.action == 'published') }}
steps:
- name: Git Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: '0'
- name: notify the main repo about the new release of docs package
Expand Down
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ inThisBuild(
List(
name := "ZIO Kafka",
zioVersion := "2.0.21",
crossScalaVersions := List("2.13.13", "3.3.1"),
ciEnabledBranches := Seq("master", "series/0.x"),
useCoursier := false,
Test / parallelExecution := false,
Expand Down

0 comments on commit ac0fadd

Please sign in to comment.