Skip to content

Commit d6fcce8

Browse files
bioballbioball
authored
Bump pkl.impl.ghactions (apple#27)
1 parent 867f542 commit d6fcce8

8 files changed

Lines changed: 80 additions & 38 deletions

File tree

‎.github/PklProject‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
amends "pkl:Project"
1717

1818
dependencies {
19-
["pkl.impl.ghactions"] { uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.7.3" }
20-
["gha"] { uri = "package://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0.0.6" }
19+
["pkl.impl.ghactions"] {
20+
uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.1.4"
21+
}
22+
["com.github.actions"] {
23+
uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.2.0"
24+
}
2125
}

‎.github/PklProject.deps.json‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
11
{
22
"schemaVersion": 1,
33
"resolvedDependencies": {
4-
"package://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0": {
4+
"package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1": {
55
"type": "remote",
6-
"uri": "projectpackage://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0.0.6",
6+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.3.0",
77
"checksums": {
8-
"sha256": "84365239996740252a91abab084d443aa3a3438f375b667ac16cb765461c1555"
8+
"sha256": "76174cb974310b3d952280b76ed224eb4ee6fd5419bf696ad9a66fba44bd427d"
99
}
1010
},
11-
"package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0": {
11+
"package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1": {
1212
"type": "remote",
13-
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.7.3",
13+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.1.4",
1414
"checksums": {
15-
"sha256": "43373b62e12e46a24d7d0c98c4eb76042ab9a0e9cd7d42476c960be5b211d4bd"
15+
"sha256": "8e6f5dcf56d091afa049b65f1e012b98f4c7a6d156aae7f8c2e778775569d892"
16+
}
17+
},
18+
"package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1": {
19+
"type": "remote",
20+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1.1.1",
21+
"checksums": {
22+
"sha256": "1e6e29b441ffdee2605d317f6543a4a604aab5af472b63f0c47d92a3b4b36f7f"
23+
}
24+
},
25+
"package://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1": {
26+
"type": "remote",
27+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.0",
28+
"checksums": {
29+
"sha256": "02ef6f25bfca5b1d095db73ea15de79d2d2c6832ebcab61e6aba90554382abcb"
1630
}
1731
}
1832
}

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
ignore:
6+
- dependency-name: '*'
7+
update-types:
8+
- version-update:semver-major
9+
schedule:
10+
interval: weekly

‎.github/index.pkl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
//===----------------------------------------------------------------------===//
1616
amends "@pkl.impl.ghactions/PklCI.pkl"
1717

18-
import "@gha/actions/Common.pkl"
19-
import "@gha/actions/Setup.pkl"
20-
import "@gha/Context.pkl"
21-
import "@gha/Workflow.pkl"
18+
import "@com.github.actions/catalog.pkl"
19+
import "@com.github.actions/context.pkl"
20+
import "@com.github.actions/Workflow.pkl"
2221

2322
build = baseWorkflow
2423

@@ -53,12 +52,12 @@ local testJob: Workflow.Job = new {
5352
name = "Build and test"
5453
`runs-on` = "ubuntu-latest"
5554
steps {
56-
new Common.Checkout {
55+
(catalog.`actions/checkout@v6`) {
5756
with {
5857
`fetch-depth` = 0
5958
}
6059
}
61-
new Setup.Java {
60+
(catalog.`actions/setup-java@v5`) {
6261
name = "Setup Java"
6362
with {
6463
distribution = "temurin"
@@ -83,16 +82,17 @@ local publishJob: Workflow.Job = new {
8382
new {
8483
name = "Triggered by"
8584
`if` = "inputs.source_run != null"
86-
run = """
85+
run =
86+
"""
8787
echo "Triggered by workflow in repo: ${{ inputs.source_run }}" >> $GITHUB_STEP_SUMMARY
8888
"""
8989
}
90-
new Common.Checkout {
90+
(catalog.`actions/checkout@v6`) {
9191
with {
9292
`fetch-depth` = 0
9393
}
9494
}
95-
new Setup.Java {
95+
(catalog.`actions/setup-java@v5`) {
9696
name = "Setup Java"
9797
with {
9898
distribution = "temurin"
@@ -101,15 +101,15 @@ local publishJob: Workflow.Job = new {
101101
}
102102
}
103103
// check out again to write credentials to workspace (needed by publish task).
104-
new Common.Checkout {
104+
(catalog.`actions/checkout@v6`) {
105105
with {
106106
`fetch-depth` = 0
107107
`persist-credentials` = true
108108
}
109109
}
110110
new {
111111
env {
112-
["GH_TOKEN"] = Context.github.token
112+
["GH_TOKEN"] = context.github.token
113113
}
114114
name = "Generate and publish docs"
115115
run = "./gradlew check generateAndPublishDocs --refresh-dependencies"

‎.github/workflows/__lockfile__.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#file: noinspection MandatoryParamsAbsent,UndefinedAction
2+
# This is a fake workflow that never runs.
3+
# It's used to pin actions to specific git SHAs when generating actual workflows.
4+
# It also gets updated by dependabot (see .github/dependabot.yml).
5+
# Generated from Workflow.pkl. DO NOT EDIT.
6+
name: __lockfile__
7+
'on': {}
8+
jobs:
9+
locks:
10+
if: 'false'
11+
runs-on: nothing
12+
steps:
13+
- name: actions/checkout@v6
14+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
15+
- name: actions/create-github-app-token@v2
16+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
17+
- name: actions/setup-java@v5
18+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
19+
- name: actions/upload-artifact@v5
20+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# Do not modify!
2-
# This file was generated from a template using https://github.com/StefMa/pkl-gha
3-
1+
# Generated from Workflow.pkl. DO NOT EDIT.
42
name: Build
53
'on':
64
push:
@@ -19,12 +17,12 @@ jobs:
1917
name: Build and test
2018
runs-on: ubuntu-latest
2119
steps:
22-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
2321
with:
2422
persist-credentials: false
2523
fetch-depth: 0
2624
- name: Setup Java
27-
uses: actions/setup-java@v5
25+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
2826
with:
2927
java-version: '21'
3028
distribution: temurin

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# Do not modify!
2-
# This file was generated from a template using https://github.com/StefMa/pkl-gha
3-
1+
# Generated from Workflow.pkl. DO NOT EDIT.
42
name: Build (main)
53
'on':
64
push:
@@ -29,17 +27,17 @@ jobs:
2927
- name: Triggered by
3028
if: inputs.source_run != null
3129
run: 'echo "Triggered by workflow in repo: ${{ inputs.source_run }}" >> $GITHUB_STEP_SUMMARY'
32-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3331
with:
3432
persist-credentials: false
3533
fetch-depth: 0
3634
- name: Setup Java
37-
uses: actions/setup-java@v5
35+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
3836
with:
3937
java-version: '21'
4038
distribution: temurin
4139
cache: gradle
42-
- uses: actions/checkout@v5
40+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
4341
with:
4442
persist-credentials: true
4543
fetch-depth: 0
@@ -55,7 +53,7 @@ jobs:
5553
steps:
5654
- name: Create app token
5755
id: app-token
58-
uses: actions/create-github-app-token@v2
56+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
5957
with:
6058
app-id: ${{ secrets.PKL_CI_CLIENT_ID }}
6159
private-key: ${{ secrets.PKL_CI }}

‎.github/workflows/prb.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# Do not modify!
2-
# This file was generated from a template using https://github.com/StefMa/pkl-gha
3-
1+
# Generated from Workflow.pkl. DO NOT EDIT.
42
name: Pull Request
53
'on':
64
pull_request: {}
@@ -14,12 +12,12 @@ jobs:
1412
name: Build and test
1513
runs-on: ubuntu-latest
1614
steps:
17-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1816
with:
1917
persist-credentials: false
2018
fetch-depth: 0
2119
- name: Setup Java
22-
uses: actions/setup-java@v5
20+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
2321
with:
2422
java-version: '21'
2523
distribution: temurin
@@ -31,14 +29,14 @@ jobs:
3129
steps:
3230
- name: Upload event file
3331
if: '!cancelled()'
34-
uses: actions/upload-artifact@v5
32+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
3533
with:
3634
name: test-results-event-file
3735
path: ${{ github.event_path }}
3836
check-pkl-github-actions:
3937
runs-on: ubuntu-latest
4038
steps:
41-
- uses: actions/checkout@v5
39+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
4240
with:
4341
persist-credentials: false
4442
- name: Setup Pkl

0 commit comments

Comments
 (0)