Skip to content

Commit

Permalink
fix sbt
Browse files Browse the repository at this point in the history
jamesward committed Jan 20, 2025
1 parent 274497e commit 6f8ae32
Showing 32 changed files with 41 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/clients.pkl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// pkl eval --multiple-file-output-path . clients.pkl

import "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected].20#/GitHubAction.pkl"
import "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected].21#/GitHubAction.pkl"
//import "../../../pklgha/src/GitHubAction.pkl"


@@ -225,7 +225,7 @@ function workflow(client: String, s: Run): GitHubAction = new GitHubAction {

jobs {
["test"] = new {
`runs-on` = s.`runs-on` ?? "ubuntu-latest"
`runs-on` = s.`runs-on` ?? "ubuntu-24.04"
`if` = "${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}"
steps = s.steps
defaults {
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/elm-worker.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/fsharp-reactive.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/go-conc.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/go-stdlib.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/java-jox.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/java-loom.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/javascript-stdlib.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/kotlin-arrow.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/kotlin-coroutines.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/kotlin-flow.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/kotlin-splitties.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/ocaml-cohttp-eio.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/ocaml-cohttp-lwt.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Install libev
2 changes: 1 addition & 1 deletion .github/workflows/python-aiohttp-taskgroup.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/python-aiohttp.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/python-httpx-asyncio.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/python-httpx-trio.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/python-rxpy.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/rust-tokio.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
3 changes: 2 additions & 1 deletion .github/workflows/scala-akkastreams.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
distribution: temurin
java-version: '21'
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
working-directory: ./scala-akkastreams
defaults:
3 changes: 2 additions & 1 deletion .github/workflows/scala-ce3.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
distribution: temurin
java-version: 21-ea
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
working-directory: ./scala-ox
defaults:
3 changes: 2 additions & 1 deletion .github/workflows/scala-gears.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
distribution: temurin
java-version: '21'
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
working-directory: ./scala-gears
defaults:
3 changes: 2 additions & 1 deletion .github/workflows/scala-kyo.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
distribution: temurin
java-version: '20'
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
working-directory: ./scala-kyo
defaults:
3 changes: 2 additions & 1 deletion .github/workflows/scala-ox.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
distribution: temurin
java-version: 21-ea
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
working-directory: ./scala-ox
defaults:
3 changes: 2 additions & 1 deletion .github/workflows/scala-soundness.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
distribution: temurin
java-version: '21'
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
working-directory: ./scala-soundness
defaults:
3 changes: 2 additions & 1 deletion .github/workflows/scala-zio.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
distribution: temurin
java-version: '20'
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
working-directory: ./scala-zio
defaults:
4 changes: 2 additions & 2 deletions .github/workflows/scenario-server.pkl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// pkl eval --format yaml -o scenario-server.yaml scenario-server.pkl

amends "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected].18#/GitHubAction.pkl"
import "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected].18#/GitHubAction.pkl"
amends "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected].21#/GitHubAction.pkl"
import "package://pkg.pkl-lang.org/github.com/jamesward/pklgha/[email protected].21#/GitHubAction.pkl"
//amends "../../../pklgha/src/GitHubAction.pkl"
//import "../../../pklgha/src/GitHubAction.pkl"

1 change: 1 addition & 0 deletions .github/workflows/scenario-server.yaml
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ jobs:
distribution: temurin
java-version: '20'
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt test
build-and-push-amd64:
runs-on: ubuntu-latest
2 changes: 1 addition & 1 deletion .github/workflows/swift-dispatch.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/typescript-effect.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- completed
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4

0 comments on commit 6f8ae32

Please sign in to comment.