Skip to content

Commit 7910621

Browse files
zong-zhezong-zhe
authored
Merge pull request #166 from kcl-lang/fix-github-action
fix: fix github action
2 parents 4873d71 + 6ef63ec commit 7910621

18 files changed

+35
-31
lines changed

‎.github/workflows/c-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
working-directory: "c"
3030
strategy:
3131
matrix:
32-
os: [macos-12, macos-latest, ubuntu-latest]
32+
os: [macos-13, macos-latest, ubuntu-latest]
3333
runs-on: ${{ matrix.os }}
3434
steps:
3535
- uses: actions/checkout@v4

‎.github/workflows/cpp-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
working-directory: "cpp"
3030
strategy:
3131
matrix:
32-
os: [macos-12, macos-latest, ubuntu-latest]
32+
os: [macos-13, macos-latest, ubuntu-latest]
3333
runs-on: ${{ matrix.os }}
3434
steps:
3535
- uses: actions/checkout@v4

‎.github/workflows/go-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
test:
2525
strategy:
2626
matrix:
27-
os: [macos-12, macos-13, macos-13-xlarge, macos-14, macos-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-latest, windows-latest]
27+
os: [macos-13, macos-13, macos-13-xlarge, macos-14, macos-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-latest, windows-latest]
2828
runs-on: ${{ matrix.os }}
2929
defaults:
3030
run:

‎.github/workflows/kotlin-test.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ jobs:
9090
kotlin/target/classes/native
9191
9292
build-centos7:
93-
runs-on: ubuntu-latest
94-
container:
95-
image: "kcllang/kcl-java-builder-centos7:0.1.0"
93+
runs-on: ubuntu-20.04
9694

9795
permissions:
9896
contents: read
@@ -128,10 +126,13 @@ jobs:
128126
name: kcl-lib-osx-aarch_64
129127
path: kotlin/native
130128

131-
- name: Package Kotlin artifact
132-
working-directory: kotlin
129+
- name: Run tests and package in CentOS 7 container
133130
run: |
134-
rustup default stable && mvn package -DskipTests=true -Dcargo-build.profile=release
131+
docker run --rm -v ${{ github.workspace }}/kotlin:/work kcllang/kcl-java-builder-centos7:0.1.0 bash -c "
132+
cd /work &&
133+
rustup default stable &&
134+
mvn package -DskipTests=true -Dcargo-build.profile=release
135+
"
135136
136137
- name: Upload artifact
137138
uses: actions/upload-artifact@v3

‎.github/workflows/nodejs-test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install rust toolchain
3333
uses: actions-rs/toolchain@v1
3434
with:
35-
toolchain: 1.74
35+
toolchain: 1.75
3636
override: true
3737
components: clippy, rustfmt
3838

@@ -163,7 +163,7 @@ jobs:
163163
path: nodejs/*.node
164164

165165
macos:
166-
runs-on: macos-12
166+
runs-on: macos-13
167167
strategy:
168168
matrix:
169169
settings:

‎.github/workflows/python-test.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ on:
2323
permissions:
2424
contents: read
2525

26+
env:
27+
PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1
28+
2629
jobs:
2730
sdist:
2831
runs-on: ubuntu-latest

‎.github/workflows/swift-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
working-directory: "swift"
3030
strategy:
3131
matrix:
32-
os: [macos-12, macos-latest, ubuntu-latest]
32+
os: [macos-13, macos-latest, ubuntu-latest]
3333
runs-on: ${{ matrix.os }}
3434
steps:
3535
- uses: actions/checkout@v4

‎.github/workflows/zig-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
working-directory: "zig"
3030
strategy:
3131
matrix:
32-
os: [macos-12, macos-latest, ubuntu-20.04, ubuntu-latest]
32+
os: [macos-13, macos-latest, ubuntu-20.04, ubuntu-latest]
3333
runs-on: ${{ matrix.os }}
3434
steps:
3535
- uses: actions/checkout@v4

‎Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ license = "Apache-2.0"
1111

1212
[dependencies]
1313
anyhow = "1"
14-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
15-
kclvm-evaluator = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
16-
kclvm-loader = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
17-
kclvm-parser = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
18-
kclvm-runtime = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
14+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
15+
kclvm-evaluator = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
16+
kclvm-loader = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
17+
kclvm-parser = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
18+
kclvm-runtime = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }

‎c/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ doc = false
1212
cbindgen = "0.26.0"
1313

1414
[dependencies]
15-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
15+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }

‎cpp/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ crate-type = ["staticlib"]
1010
[dependencies]
1111
anyhow = "1.0"
1212
cxx = "1.0"
13-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
13+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
1414

1515
[build-dependencies]
1616
cxx-build = "1.0"

‎dotnet/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ crate-type = ["cdylib"]
88
doc = false
99

1010
[dependencies]
11-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
11+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }

‎java/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ serde = { version = "1", features = ["derive"] }
1818
once_cell = "1.19.0"
1919
lazy_static = "1.4.0"
2020

21-
kclvm-parser = { git = "https://github.com/kcl-lang/kcl", version = "0.11.0-alpha.1" }
22-
kclvm-sema = { git = "https://github.com/kcl-lang/kcl", version = "0.11.0-alpha.1" }
23-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.11.0-alpha.1" }
21+
kclvm-parser = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
22+
kclvm-sema = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
23+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }

‎kotlin/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ serde = { version = "1", features = ["derive"] }
1818
once_cell = "1.19.0"
1919
lazy_static = "1.4.0"
2020

21-
kclvm-parser = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
22-
kclvm-sema = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
23-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
21+
kclvm-parser = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
22+
kclvm-sema = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
23+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }

‎lua/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ mlua = { version = "0.9", features = [
1616
"module",
1717
"macros",
1818
], default-features = false, optional = true }
19-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
19+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }

‎nodejs/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version = "0.0.0"
77
crate-type = ["cdylib"]
88

99
[dependencies]
10-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
10+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
1111
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
1212
napi = { version = "2.12.2", default-features = false, features = ["napi4"] }
1313
napi-derive = "2.12.2"

‎python/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ edition = "2021"
88
crate-type = ["cdylib"]
99

1010
[dependencies]
11-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
11+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }
1212
pyo3 = "0.20.1"

‎swift/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ doc = false
1212
cbindgen = "0.26.0"
1313

1414
[dependencies]
15-
kclvm-api = { git = "https://github.com/kcl-lang/kcl", version = "0.10.8" }
15+
kclvm-api = { git = "https://github.com/kcl-lang/kcl", rev = "2aa8fea", version = "0.10.8" }

0 commit comments

Comments
 (0)