From 09227b20e6674ef9a1d9d4138ac2990d492a0c04 Mon Sep 17 00:00:00 2001 From: Xephobia Date: Wed, 27 May 2020 09:53:50 +0200 Subject: [PATCH 1/7] Create windowsbuild.yml --- .github/workflows/windowsbuild.yml | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/windowsbuild.yml diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml new file mode 100644 index 00000000..e8a17463 --- /dev/null +++ b/.github/workflows/windowsbuild.yml @@ -0,0 +1,35 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup Node.js environment + uses: actions/setup-node@v1.4.2 + + - name: setup-msbuild + uses: microsoft/setup-msbuild@v1 + + - name: Kromx process + run: node Kromx/make + + - name: extract v8_monolith + uses: DuckSoft/extract-7z-action@v1.0 + with: + pathSource: Kromx/v8/libraries/win32/release/v8_monolith.7z + pathTarget: Kromx/v8/libraries/win32/release/ + + - name: Kinc process + run: node Kromx/Kinc/make -g direct3d11 + + - name: build solution + run: msbuild Kromx/build/Krom.sln /property:Configuration=Release From 78f4d41580dafac1ef7a36ee8c22cf3f91e5fc38 Mon Sep 17 00:00:00 2001 From: Xephobia Date: Wed, 27 May 2020 09:55:44 +0200 Subject: [PATCH 2/7] fix typo --- .github/workflows/windowsbuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml index e8a17463..d4eeeaaf 100644 --- a/.github/workflows/windowsbuild.yml +++ b/.github/workflows/windowsbuild.yml @@ -20,7 +20,7 @@ jobs: uses: microsoft/setup-msbuild@v1 - name: Kromx process - run: node Kromx/make + run: node Kromx/make - name: extract v8_monolith uses: DuckSoft/extract-7z-action@v1.0 @@ -32,4 +32,4 @@ jobs: run: node Kromx/Kinc/make -g direct3d11 - name: build solution - run: msbuild Kromx/build/Krom.sln /property:Configuration=Release + run: msbuild Kromx/build/Krom.sln /property:Configuration=Release From fca843e863457f908639321d0ea9a7ede695c1eb Mon Sep 17 00:00:00 2001 From: Xephobia Date: Wed, 27 May 2020 09:59:54 +0200 Subject: [PATCH 3/7] fix typo (again) --- .github/workflows/windowsbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml index d4eeeaaf..86986f6d 100644 --- a/.github/workflows/windowsbuild.yml +++ b/.github/workflows/windowsbuild.yml @@ -29,7 +29,7 @@ jobs: pathTarget: Kromx/v8/libraries/win32/release/ - name: Kinc process - run: node Kromx/Kinc/make -g direct3d11 + run: node Kromx/Kinc/make -g direct3d11 - name: build solution run: msbuild Kromx/build/Krom.sln /property:Configuration=Release From 930885fd9e41d729d25f28c885aa1d3990174feb Mon Sep 17 00:00:00 2001 From: Xephobia Date: Wed, 27 May 2020 10:16:31 +0200 Subject: [PATCH 4/7] compile directly with --compile --- .github/workflows/windowsbuild.yml | 37 +++++++++++++----------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml index 86986f6d..3d4be352 100644 --- a/.github/workflows/windowsbuild.yml +++ b/.github/workflows/windowsbuild.yml @@ -1,35 +1,30 @@ -name: CI +name: Windows (Direct3D 11) on: push: - branches: [ master ] + branches: + - master pull_request: - branches: [ master ] + branches: + - master jobs: build: + runs-on: windows-latest - + steps: - - uses: actions/checkout@v2 - - - name: Setup Node.js environment + - uses: actions/checkout@v1 + - name: Get Submodules + run: git submodule update --init --recursive + - name: Get Node.js uses: actions/setup-node@v1.4.2 - - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - - name: Kromx process - run: node Kromx/make - - - name: extract v8_monolith + - name: kromx + run: node Kromx/make -g direct3d11 + - name: Unpack v8_monolith uses: DuckSoft/extract-7z-action@v1.0 with: pathSource: Kromx/v8/libraries/win32/release/v8_monolith.7z pathTarget: Kromx/v8/libraries/win32/release/ - - - name: Kinc process - run: node Kromx/Kinc/make -g direct3d11 - - - name: build solution - run: msbuild Kromx/build/Krom.sln /property:Configuration=Release + - name: Kinc and compile + run: node Kinc/make -g direct3d11 --compile From 97833a4ee90433647d9a5e4a7a97c5100e9b1126 Mon Sep 17 00:00:00 2001 From: Xephobia Date: Wed, 27 May 2020 10:22:41 +0200 Subject: [PATCH 5/7] fix typo again because i'm stupid --- .github/workflows/windowsbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml index 3d4be352..9fc7aed9 100644 --- a/.github/workflows/windowsbuild.yml +++ b/.github/workflows/windowsbuild.yml @@ -27,4 +27,4 @@ jobs: pathSource: Kromx/v8/libraries/win32/release/v8_monolith.7z pathTarget: Kromx/v8/libraries/win32/release/ - name: Kinc and compile - run: node Kinc/make -g direct3d11 --compile + run: node Kromx/Kinc/make -g direct3d11 --compile From c45923e51fcb1aeb183b75549f1987804680d3a9 Mon Sep 17 00:00:00 2001 From: Xephobia Date: Wed, 27 May 2020 11:10:19 +0200 Subject: [PATCH 6/7] fix file path --- .github/workflows/windowsbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml index 9fc7aed9..42363859 100644 --- a/.github/workflows/windowsbuild.yml +++ b/.github/workflows/windowsbuild.yml @@ -27,4 +27,4 @@ jobs: pathSource: Kromx/v8/libraries/win32/release/v8_monolith.7z pathTarget: Kromx/v8/libraries/win32/release/ - name: Kinc and compile - run: node Kromx/Kinc/make -g direct3d11 --compile + run: cd Kromx;node Kinc/make -g direct3d11 --compile From 3d5b9f99dca4769402c0cfbe3aa354b3e3c2d1e0 Mon Sep 17 00:00:00 2001 From: Xephobia Date: Wed, 27 May 2020 12:08:00 +0200 Subject: [PATCH 7/7] test if it works --- .github/workflows/windowsbuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml index 42363859..7fedec7a 100644 --- a/.github/workflows/windowsbuild.yml +++ b/.github/workflows/windowsbuild.yml @@ -19,6 +19,8 @@ jobs: run: git submodule update --init --recursive - name: Get Node.js uses: actions/setup-node@v1.4.2 + - name: install msbuild + uses: microsoft/setup-msbuild@v1 - name: kromx run: node Kromx/make -g direct3d11 - name: Unpack v8_monolith