Compare commits

..

7 Commits

Author SHA1 Message Date
FriwiDev
07efaec193 Update scripts 2023-02-12 23:34:23 +01:00
FriwiDev
c7bc921d5c Update workflows 2023-02-12 23:10:30 +01:00
Friwi
9d76d6db93 Merge pull request #8 from Osiris-Team/master
Update to new github permissions
2023-02-08 11:54:55 +01:00
Osiris-Team
bd57943116 Update build-all.yml 2023-02-07 22:07:31 +01:00
Osiris-Team
96fb8eae4b Update build-all.yml 2023-02-04 15:54:11 +01:00
Friwi
a516b46ab4 Just macos things 2023-01-30 05:31:00 +01:00
Friwi
2ea4e2bbbf Fix build error on macosx 2023-01-30 05:10:53 +01:00
6 changed files with 28 additions and 9 deletions

View File

@@ -15,6 +15,8 @@ on:
jobs:
create-release:
runs-on: ubuntu-latest
permissions:
contents: write
outputs:
release_tag_name: ${{ env.release_tag_name }}
build_meta: ${{ env.build_meta }}
@@ -50,6 +52,8 @@ jobs:
build-linux-amd64:
runs-on: ubuntu-latest
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
@@ -75,6 +79,8 @@ jobs:
build-linux-arm64:
runs-on: ubuntu-latest
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
@@ -100,6 +106,8 @@ jobs:
build-linux-arm:
runs-on: ubuntu-latest
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
@@ -123,8 +131,10 @@ jobs:
build-windows-amd64:
runs-on: windows-2019
runs-on: windows-2022
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
-
@@ -141,8 +151,10 @@ jobs:
build-windows-i386:
runs-on: windows-2019
runs-on: windows-2022
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
-
@@ -159,8 +171,10 @@ jobs:
build-windows-arm64:
runs-on: windows-2019
runs-on: windows-2022
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
-
@@ -179,6 +193,8 @@ jobs:
build-macosx-amd64:
runs-on: macos-12
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
-
@@ -244,6 +260,8 @@ jobs:
build-macosx-arm64:
runs-on: macos-12
needs: create-release
permissions:
contents: write
steps:
- uses: actions/checkout@v3
-

View File

@@ -14,7 +14,7 @@ on:
jobs:
build-windows-amd64:
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
-

View File

@@ -14,7 +14,7 @@ on:
jobs:
build-windows-arm64:
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
-

View File

@@ -14,7 +14,7 @@ on:
jobs:
build-windows-i386:
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
-

View File

@@ -64,6 +64,7 @@ ninja -j4
#Generate distribution
cd ../tools
sed -i "" 's/--ignore-source-errors//g' make_docs.sh
chmod +x make_distrib.sh
./make_distrib.sh macosx64
cd ..

View File

@@ -19,9 +19,9 @@ python C:/patch_cmake.py CMakeLists.txt C:/CMakeLists.txt.patch
mkdir jcef_build && cd jcef_build
:: Load vcvars for 32 or 64-bit builds
if "%TARGETARCH%"=="386" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat")
if "%TARGETARCH%"=="amd64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat")
if "%TARGETARCH%"=="arm64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsamd64_arm64.bat")
if "%TARGETARCH%"=="386" (call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars32.bat")
if "%TARGETARCH%"=="amd64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat")
if "%TARGETARCH%"=="arm64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_arm64.bat")
:: Edit PATH variable on 386 to use 32 bit jdk (cmake findjni does not actually care about JAVA_HOME)
if "%TARGETARCH%"=="386" (set "PATH=C:/Program Files (x86)/Java/jdk1.8.0_211;%PATH%")