Skip to content

Commit 69c9260

Browse files
tmarkovskitmarkovski
authored
Merge branch 'main' into okapi-dotnet6
2 parents e7e6c9c + d01f8cc commit 69c9260

9 files changed

Lines changed: 76 additions & 60 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/.github/ @fundthmcalculus @tmarkovski
2+
/dotnet/ @tmarkovski
3+
/go/ @fundthmcalculus
4+
/java/ @fundthmcalculus
5+
/native/ @tmarkovski
6+
/proto/ @fundthmcalculus @tmarkovski
7+
/python/ @fundthmcalculus
8+
/ruby/ @fundthmcalculus
9+
/wasm/ @tmarkovski

‎.github/workflows/build-dotnet.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
name: Build .NET SDK
1+
name: .NET
22

33
on:
44
workflow_call:
55
workflow_dispatch:
6-
pull_request:
7-
paths:
8-
- "dotnet/**"
9-
- "proto/**"
10-
- ".github/workflows/*dotnet*"
116
push:
127
branches:
138
- main
149

1510
jobs:
1611
build-and-test-dotnet:
17-
name: .NET SDK Testing
12+
name: Build, Test
1813
runs-on: ${{ matrix.os-artifact[0] }}
1914
strategy:
2015
fail-fast: false
@@ -40,7 +35,7 @@ jobs:
4035
path: 'dotnet/Tests/Okapi.Tests/TestResults/test_output.xml'
4136

4237
publish-test-results-dotnet:
43-
name: Publish .NET Test Results
38+
name: Publish Test Results
4439
needs: build-and-test-dotnet
4540
runs-on: ubuntu-latest
4641
if: always()

‎.github/workflows/build-golang.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
name: Go
22

33
on:
4+
workflow_call:
45
workflow_dispatch:
5-
pull_request:
6-
paths:
7-
- "go/**"
8-
- "proto/**"
9-
- ".github/workflows/*golang*"
106
push:
117
branches:
128
- main
139

1410
jobs:
1511
build-and-test-golang:
16-
name: Test Go code
12+
name: Build, Test
1713
runs-on: ${{ matrix.os-artifact[0] }}
1814
strategy:
1915
fail-fast: false
@@ -58,7 +54,7 @@ jobs:
5854
path: 'go/okapi/test_output*.xml'
5955

6056
publish-test-results-golang:
61-
name: Publish Golang Test Results
57+
name: Publish Test Results
6258
needs: build-and-test-golang
6359
runs-on: ubuntu-latest
6460
if: always()

‎.github/workflows/build-java.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
name: Build Java SDK
1+
name: Java
22

33
on:
4+
workflow_call:
45
workflow_dispatch:
5-
pull_request:
6-
paths:
7-
- "java/**"
8-
- "proto/**"
9-
- ".github/workflows/*java*"
106
push:
117
branches:
128
- main
139

1410
jobs:
1511
build-and-test-java:
12+
name: Build, Test
1613
runs-on: ${{ matrix.os-artifact[0] }}
1714
strategy:
1815
fail-fast: false
@@ -54,7 +51,7 @@ jobs:
5451
path: 'java/build/test-results/test/TEST-*.xml'
5552

5653
publish-test-results-java:
57-
name: Publish Java Test Results
54+
name: Publish Test Results
5855
needs: build-and-test-java
5956
runs-on: ubuntu-latest
6057
if: always()

‎.github/workflows/build-libs.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
name: Build Platform Libraries
1+
name: Platform Libraries
22

33
on:
4+
workflow_call:
45
workflow_dispatch:
5-
pull_request:
6-
paths:
7-
- "native/**"
8-
- "proto/**"
9-
- ".github/workflows/*libs*"
10-
- "devops/BuildLibraries.ps1"
116
schedule:
127
# Do it twice a day to guarantee that the binaries never expire and give the "couldn't download artifact" run error in other jobs
138
- cron: "* */12 * * *"
@@ -174,7 +169,7 @@ jobs:
174169
path: ./libs/android/*
175170

176171
build_wasm:
177-
name: Wasm
172+
name: Wasm (Emscripten)
178173
if: "! contains(github.event.head_commit.message, '[skip ci]')"
179174
runs-on: macos-latest
180175
steps:

‎.github/workflows/build-ruby.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
name: Build Ruby bindings
1+
name: Ruby
22

33
on:
4+
workflow_call:
45
workflow_dispatch:
5-
pull_request:
6-
paths:
7-
- "ruby/**"
8-
- "proto/**"
9-
- ".github/workflows/*ruby*"
106
push:
117
branches:
128
- main
139

1410
jobs:
1511
build-and-test-ruby:
12+
name: Build, Test
1613
runs-on: ${{ matrix.os }}
1714
strategy:
1815
fail-fast: false
@@ -53,8 +50,6 @@ jobs:
5350
DYLD_FALLBACK_LIBRARY_PATH: "${{ github.workspace }}/libs"
5451
DYLD_LIBRARY_PATH: "${{ github.workspace }}/libs"
5552
LD_LIBRARY_PATH: "${{ github.workspace }}/libs"
56-
DYLD_FALLBACK_LIBRARY_PATH: "${{ github.workspace }}/libs"
57-
DYLD_LIBRARY_PATH: "${{ github.workspace }}/libs"
5853
- name: Upload Unit Test Results - Ruby
5954
if: always()
6055
uses: actions/upload-artifact@v2
@@ -63,7 +58,7 @@ jobs:
6358
path: 'ruby/test/reports/TEST-*.xml'
6459

6560
publish-test-results-ruby:
66-
name: Publish Ruby Test Results
61+
name: Publish Test Results
6762
needs: build-and-test-ruby
6863
runs-on: ubuntu-latest
6964
if: always()

‎.github/workflows/build-wasm.yml‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,15 @@
1-
name: Wasm
1+
name: Web Assembly
22

33
on:
44
workflow_call:
5-
pull_request:
6-
branches:
7-
- main
8-
paths:
9-
- "native/**"
10-
- "proto/**"
11-
- "wasm/**"
12-
- ".github/workflows/*wasm*"
13-
- ".github/workflows/*node*"
14-
- ".github/workflows/*browser*"
155
push:
166
branches:
177
- main
18-
paths:
19-
- "native/**"
20-
- "proto/**"
21-
- "wasm/**"
22-
- ".github/workflows/*wasm*"
23-
- ".github/workflows/*node*"
24-
- ".github/workflows/*browser*"
258
workflow_dispatch:
269

2710
jobs:
2811
build_test:
29-
name: Build
12+
name: Build, Test
3013
runs-on: macos-latest
3114
defaults:
3215
run:

‎.github/workflows/pr-validate.yml‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
changes:
10-
name: Detect Changes
10+
name: Changes
1111
runs-on: ubuntu-latest
1212
outputs:
1313
dotnet: ${{ steps.paths.outputs.dotnet }}
@@ -32,7 +32,23 @@ jobs:
3232
- "python/**"
3333
- "proto/**"
3434
- ".github/workflows/*python*"
35-
35+
go:
36+
- "go/**"
37+
- "proto/**"
38+
- ".github/workflows/*golang*"
39+
java:
40+
- "java/**"
41+
- "proto/**"
42+
- ".github/workflows/*java*"
43+
native:
44+
- "native/**"
45+
- "proto/**"
46+
- ".github/workflows/*libs*"
47+
- "devops/BuildLibraries.ps1"
48+
ruby:
49+
- "ruby/**"
50+
- "proto/**"
51+
- ".github/workflows/*ruby*"
3652
3753
build-dotnet:
3854
name: ".NET"
@@ -52,13 +68,41 @@ jobs:
5268
needs: changes
5369
if: needs.changes.outputs.python == 'true'
5470

71+
build-go:
72+
name: Go
73+
uses: trinsic-id/okapi/.github/workflows/build-golang.yml@main
74+
needs: changes
75+
if: needs.changes.outputs.go == 'true'
76+
77+
build-java:
78+
name: Java
79+
uses: trinsic-id/okapi/.github/workflows/build-java.yml@main
80+
needs: changes
81+
if: needs.changes.outputs.java == 'true'
82+
83+
build-native:
84+
name: Native
85+
uses: trinsic-id/okapi/.github/workflows/build-libs.yml@main
86+
needs: changes
87+
if: needs.changes.outputs.native == 'true'
88+
89+
build-ruby:
90+
name: Ruby
91+
uses: trinsic-id/okapi/.github/workflows/build-ruby.yml@main
92+
needs: changes
93+
if: needs.changes.outputs.ruby == 'true'
94+
5595
pr-valid:
5696
name: PR Valid
5797
runs-on: ubuntu-latest
5898
needs:
5999
- build-dotnet
60100
- build-wasm
61101
- build-python
102+
- build-go
103+
- build-java
104+
- build-native
105+
- build-ruby
62106
if: ${{ always() && contains(needs.*.result, 'success') && !(contains(needs.*.result, 'failure')) }}
63107
steps:
64108
- run: echo fin

‎ruby/test/ldproof_test.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ def base64_padding(base_64)
6464
base_64 += '=='
6565
when 3
6666
base_64 += '='
67+
else
68+
raise "Invalid base-64 string!"
6769
end
6870
base_64
6971
end

0 commit comments

Comments
 (0)