Skip to content

Commit f19d492

Browse files
committed
Merge branch 'master' into hs8
2 parents b2f2537 + 4621d70 commit f19d492

File tree

42 files changed

+549
-100
lines changed

Some content is hidden

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

42 files changed

+549
-100
lines changed

.github/workflows/build-emscripten.yml renamed to .github/workflows/actions/build-emscripten.yml

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ concurrency:
1717
group: ${{ github.workflow }}-${{ github.ref }}
1818
cancel-in-progress: true
1919

20+
# env:
21+
# ccache: ccache
22+
2023
jobs:
2124
build-emscripten:
2225
runs-on: ubuntu-latest

.github/workflows/build-ios-tvos.yml renamed to .github/workflows/actions/build-ios-tvos.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-ios-tvos:
2525
runs-on: macos-13

.github/workflows/build-linux64.yml renamed to .github/workflows/actions/build-linux64.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-linux64-platforms:
2525
runs-on: ubuntu-latest
@@ -61,4 +61,3 @@ jobs:
6161
# run: scripts/ci/upload_of_lib.sh;
6262
# env:
6363
# GA_CI_SECRET: ${{ secrets.CI_SECRET }}
64-

.github/workflows/build-macos.yml renamed to .github/workflows/actions/build-macos.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-macos:
2525
runs-on: macos-13

.github/workflows/build-msys2.yml renamed to .github/workflows/actions/build-msys2.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-msys2:
2525
runs-on: windows-latest
@@ -64,5 +64,3 @@ jobs:
6464

6565
- name: Run tests
6666
run: ./scripts/ci/msys2/run_tests.sh
67-
68-

.github/workflows/build-rpi.yml renamed to .github/workflows/actions/build-rpi.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
rpi-build:
2525
runs-on: ubuntu-latest
@@ -52,4 +52,3 @@ jobs:
5252
run: ./scripts/ci/linuxrpi/install.sh;
5353
- name: Build
5454
run: ./scripts/ci/linuxrpi/build.sh;
55-

.github/workflows/build-vs2022.yml renamed to .github/workflows/actions/build-vs2022.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ concurrency:
1717
group: ${{ github.workflow }}-${{ github.ref }}
1818
cancel-in-progress: true
1919

20+
# env:
21+
# ccache: ccache
22+
2023
jobs:
2124
build-vs2022:
2225
runs-on: windows-2022
@@ -58,4 +61,3 @@ jobs:
5861
working-directory: ${{env.GITHUB_WORKSPACE}}
5962
run:
6063
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
61-

.github/workflows/all.py

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/python3
2+
import glob
3+
4+
lista = glob.glob('actions/*.yml')
5+
print(lista)
6+
contagem = 0
7+
alllines = ''
8+
lines = []
9+
first = True
10+
for a in lista:
11+
print(a)
12+
f = open(a,'r')
13+
# alllines += (f.read() + '\n\n\n\n')
14+
15+
16+
if first:
17+
first = False
18+
lines += 'name: OF'
19+
lines += ''
20+
lines += f.readlines()[1:]
21+
else:
22+
lines += f.readlines()[23:]
23+
# lines.append(f.readlines()[2:])
24+
lines += '\n\n'
25+
lines += '# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \n\n'
26+
# lines.append('\n\n\n\n')
27+
f.close()
28+
29+
all = open('of.yml','w')
30+
# all.write(alllines)
31+
print(lines)
32+
all.writelines(lines)
33+
all.close()
34+
35+
print (alllines)

0 commit comments

Comments
 (0)