Skip to content

Commit bdaf9cf

Browse files
TaoyuesongTaoyuesong
committed
Merge branch 'refs/heads/master' into feat/#364
# Conflicts: # Casbin.UnitTests/GenericTests/GenericFunctionTest.cs
2 parents 91f56ab + 85b9330 commit bdaf9cf

File tree

117 files changed

+1984
-2277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1984
-2277
lines changed

‎.github/workflows/build.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

2424
- name: Setup .NET SDK
25-
uses: actions/setup-dotnet@v1
25+
uses: actions/setup-dotnet@v4
2626
with:
2727
dotnet-version: |
2828
3.1.x
@@ -70,7 +70,7 @@ jobs:
7070
7171
- name: Upload test results artefacts
7272
if: github.repository_owner == 'casbin' && github.event_name == 'push'
73-
uses: actions/upload-artifact@v1.0.0
73+
uses: actions/upload-artifact@v4
7474
with:
7575
name: "drop-ci-test-results"
7676
path: './test-results'
@@ -82,12 +82,17 @@ jobs:
8282

8383
steps:
8484
- name: Checkout
85-
uses: actions/checkout@v2
85+
uses: actions/checkout@v4
86+
87+
- name: Setup Node.js
88+
uses: actions/setup-node@v4
89+
with:
90+
node-version: 20
8691

8792
- name: Dry run semantic-release
8893
run: |
8994
export PATH=$PATH:$(yarn global bin)
90-
yarn global add semantic-release@17.4.3
95+
yarn global add semantic-release@24.1.1
9196
semantic-release --dry-run
9297
9398
release-build-version:
@@ -97,7 +102,7 @@ jobs:
97102

98103
steps:
99104
- name: Checkout
100-
uses: actions/checkout@v2
105+
uses: actions/checkout@v4
101106
with:
102107
fetch-depth: 0
103108

@@ -108,7 +113,7 @@ jobs:
108113
run: git tag -l -n
109114

110115
- name: Setup .NET SDK
111-
uses: actions/setup-dotnet@v1
116+
uses: actions/setup-dotnet@v4
112117
with:
113118
dotnet-version: |
114119
3.1.x
@@ -147,7 +152,7 @@ jobs:
147152
}
148153
149154
- name: Upload packages artefacts
150-
uses: actions/upload-artifact@v1.0.0
155+
uses: actions/upload-artifact@v4
151156
with:
152157
name: "drop-ci-build-packages"
153158
path: './packages'

‎.github/workflows/infersharp.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99

1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515

1616
- name: Setup .NET SDK
17-
uses: actions/setup-dotnet@v1
17+
uses: actions/setup-dotnet@v4
1818
with:
1919
dotnet-version: |
2020
3.1.x
@@ -43,7 +43,7 @@ jobs:
4343
run: cat infer-out/report.txt
4444

4545
- name: Upload net8.0 infer# results artefacts
46-
uses: actions/upload-artifact@v1.0.0
46+
uses: actions/upload-artifact@v4
4747
with:
4848
name: "infersharp-net8.0-results"
4949
path: './infer-out/report.txt'
@@ -57,7 +57,7 @@ jobs:
5757
run: cat infer-out/report.txt
5858

5959
- name: Upload net7.0 infer# results artefacts
60-
uses: actions/upload-artifact@v1.0.0
60+
uses: actions/upload-artifact@v4
6161
with:
6262
name: "infersharp-net7.0-results"
6363
path: './infer-out/report.txt'
@@ -71,7 +71,7 @@ jobs:
7171
run: cat infer-out/report.txt
7272

7373
- name: Upload net6.0 infer# results artefacts
74-
uses: actions/upload-artifact@v1.0.0
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: "infersharp-net6.0-results"
7777
path: './infer-out/report.txt'
@@ -85,7 +85,7 @@ jobs:
8585
run: cat infer-out/report.txt
8686

8787
- name: Upload net5.0 infer# results artefacts
88-
uses: actions/upload-artifact@v1.0.0
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: "infersharp-net5.0-results"
9191
path: './infer-out/report.txt'
@@ -99,7 +99,7 @@ jobs:
9999
run: cat infer-out/report.txt
100100

101101
- name: Upload net3.1 infer# results artefacts
102-
uses: actions/upload-artifact@v1.0.0
102+
uses: actions/upload-artifact@v4
103103
with:
104104
name: "infersharp-net3.1-results"
105105
path: './infer-out/report.txt'

‎.github/workflows/release.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0
3030

3131
- name: Setup .NET SDK
32-
uses: actions/setup-dotnet@v1
32+
uses: actions/setup-dotnet@v4
3333
with:
3434
dotnet-version: |
3535
3.1.x
@@ -75,7 +75,7 @@ jobs:
7575
}
7676
7777
- name: Upload test results artefacts
78-
uses: actions/upload-artifact@v1.0.0
78+
uses: actions/upload-artifact@v4
7979
with:
8080
name: "drop-ci-test-results"
8181
path: './test-results'
@@ -87,12 +87,17 @@ jobs:
8787

8888
steps:
8989
- name: Checkout
90-
uses: actions/checkout@v2
90+
uses: actions/checkout@v4
91+
92+
- name: Setup Node.js
93+
uses: actions/setup-node@v4
94+
with:
95+
node-version: 20
9196

9297
- name: Run semantic-release
9398
run: |
9499
export PATH=$PATH:$(yarn global bin)
95-
yarn global add semantic-release@19.0.2
100+
yarn global add semantic-release@24.1.1
96101
semantic-release
97102
98103
push-packages:
@@ -102,7 +107,7 @@ jobs:
102107

103108
steps:
104109
- name: Checkout
105-
uses: actions/checkout@v2
110+
uses: actions/checkout@v4
106111
with:
107112
fetch-depth: 0
108113

@@ -113,7 +118,7 @@ jobs:
113118
run: git tag -l -n
114119

115120
- name: Setup .NET SDK
116-
uses: actions/setup-dotnet@v1
121+
uses: actions/setup-dotnet@v4
117122
with:
118123
dotnet-version: |
119124
3.1.x
@@ -148,7 +153,7 @@ jobs:
148153
}
149154
150155
- name: Upload packages artefacts
151-
uses: actions/upload-artifact@v1.0.0
156+
uses: actions/upload-artifact@v4
152157
with:
153158
name: "drop-ci-packages"
154159
path: './packages'

‎.github/workflows/semantic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: windows-latest
99
steps:
1010
- name: semantic-pull-request
11-
uses: amannn/action-semantic-pull-request@v4
11+
uses: amannn/action-semantic-pull-request@v5
1212
env:
1313
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1414
with:

‎Casbin.Benchmark/TestHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public static class TestHelper
66
{
77
public static string GetTestFilePath(string fileName)
88
{
9-
return Path.Combine("examples", fileName);
9+
return Path.Combine("Examples", fileName);
1010
}
1111
}
1212
}

‎Casbin.UnitTests/examples/abac_comment.conf renamed to ‎Casbin.UnitTests/Examples/abac_comment.conf

File renamed without changes.

‎Casbin.UnitTests/examples/abac_model.conf renamed to ‎Casbin.UnitTests/Examples/abac_model.conf

File renamed without changes.

‎Casbin.UnitTests/examples/abac_rule_model.conf renamed to ‎Casbin.UnitTests/Examples/abac_rule_model.conf

File renamed without changes.

‎Casbin.UnitTests/examples/abac_rule_policy.csv renamed to ‎Casbin.UnitTests/Examples/abac_rule_policy.csv

File renamed without changes.

‎Casbin.UnitTests/examples/abac_with_dynamic_value_type_model.conf renamed to ‎Casbin.UnitTests/Examples/abac_with_dynamic_value_type_model.conf

File renamed without changes.

0 commit comments

Comments
 (0)