From cc2f9e219c0402b7bab2e9d90700c078c72010e6 Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 11:00:59 +0200 Subject: [PATCH 1/9] windows added to release build pipeline --- .github/workflows/release-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index b17c4f893..15df08a16 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -25,7 +25,7 @@ jobs: runs-on: ${{ matrix.platform }} # we run many different builds strategy: matrix: - platform: [ubuntu-latest, macos-latest] + platform: [ubuntu-latest, macos-latest, windows-latest] steps: # checkout - name: Checkout code From fe6038803ffa39b6c84a15bbe880aaf552711010 Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 11:26:19 +0200 Subject: [PATCH 2/9] release pipeline update --- .github/workflows/release-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 15df08a16..5962c1a6b 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -31,7 +31,7 @@ jobs: - name: Checkout code uses: actions/checkout@v1 - name: Build qjsc - run: ./build.sh + run: make qjsc - name: Upload release assets uses: actions/upload-release-asset@v1 env: From 508ec7da11317a28292aaffe791b14c0d1999cfb Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 12:59:13 +0200 Subject: [PATCH 3/9] windows build turned on in makefile --- .github/workflows/release-artifacts.yml | 9 ++++++++- Makefile | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 5962c1a6b..a217b28f1 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -25,13 +25,20 @@ jobs: runs-on: ${{ matrix.platform }} # we run many different builds strategy: matrix: - platform: [ubuntu-latest, macos-latest, windows-latest] + platform: [ubuntu-latest] steps: # checkout - name: Checkout code uses: actions/checkout@v1 + - name: Set up MinGW + uses: egor-tensin/setup-mingw@v2 + with: + platform: x64 + if: matrix.platform == 'ubuntu-latest' - name: Build qjsc run: make qjsc + - name: ls + run: ls - name: Upload release assets uses: actions/upload-release-asset@v1 env: diff --git a/Makefile b/Makefile index 49b1f6fa7..191f9a217 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ ifeq ($(shell uname -s),Darwin) CONFIG_DARWIN=y endif # Windows cross compilation from Linux -#CONFIG_WIN32=y +CONFIG_WIN32=y # use link time optimization (smaller and faster executables but slower build) CONFIG_LTO=y # consider warnings as errors (for development) From 69f73369f0d172f1d9e2b3da39883f3819b65ca2 Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 13:15:30 +0200 Subject: [PATCH 4/9] release pipeline updated --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 191f9a217..77a8b245f 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ CONFIG_LTO=y ifdef CONFIG_DARWIN # use clang instead of gcc -CONFIG_CLANG=y +# CONFIG_CLANG=y CONFIG_DEFAULT_AR=y endif From 22bcc226b84287103c3a830435d6e8fd0f7fc7d6 Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 13:37:57 +0200 Subject: [PATCH 5/9] release pipeline updated --- .github/workflows/release-artifacts.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index a217b28f1..02be58ebe 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -35,10 +35,10 @@ jobs: with: platform: x64 if: matrix.platform == 'ubuntu-latest' + - name: Setup upterm session + uses: lhotari/action-upterm@v1 - name: Build qjsc run: make qjsc - - name: ls - run: ls - name: Upload release assets uses: actions/upload-release-asset@v1 env: diff --git a/Makefile b/Makefile index 77a8b245f..191f9a217 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ CONFIG_LTO=y ifdef CONFIG_DARWIN # use clang instead of gcc -# CONFIG_CLANG=y +CONFIG_CLANG=y CONFIG_DEFAULT_AR=y endif From feef6ad102f7c66e438e11fb59f19ad67c8a8bce Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 14:26:44 +0200 Subject: [PATCH 6/9] release pipeline update --- .github/workflows/release-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 02be58ebe..e9b14f5f4 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -35,8 +35,8 @@ jobs: with: platform: x64 if: matrix.platform == 'ubuntu-latest' - - name: Setup upterm session - uses: lhotari/action-upterm@v1 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Build qjsc run: make qjsc - name: Upload release assets From 41cf64eed895c9b3bf3d38d443463b46e8dd8523 Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 15:28:41 +0200 Subject: [PATCH 7/9] release pipeline update --- .github/workflows/release-artifacts.yml | 38 +++++++++++++++++++------ Makefile | 2 +- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index e9b14f5f4..963151ca0 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -19,13 +19,35 @@ jobs: release_name: ${{ github.ref }} draft: false prerelease: false - release_assets: - name: Release assets + release_assets_linux_mac: + name: Release Linux and MacOS assets needs: create_release # we need to know the upload URL runs-on: ${{ matrix.platform }} # we run many different builds strategy: matrix: - platform: [ubuntu-latest] + platform: [ubuntu-latest, macos-latest] + steps: + # checkout + - name: Checkout code + uses: actions/checkout@v1 + - name: Build qjsc + run: ./build.sh + - name: Upload release assets + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ needs.create_release.outputs.upload_url }} + # This is how it will be named on the release page. + asset_name: qjsc-${{ runner.os }}-${{ runner.arch }} + # The path to the file you want to upload. + asset_path: ./qjsc + # set type of the file you are uploading + asset_content_type: application/octet-stream + release_assets_windows: + name: Release Windows assets + needs: create_release # we need to know the upload URL + runs-on: ubuntu-latest steps: # checkout - name: Checkout code @@ -34,11 +56,8 @@ jobs: uses: egor-tensin/setup-mingw@v2 with: platform: x64 - if: matrix.platform == 'ubuntu-latest' - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - name: Build qjsc - run: make qjsc + run: make CONFIG_WIN32=y - name: Upload release assets uses: actions/upload-release-asset@v1 env: @@ -46,8 +65,9 @@ jobs: with: upload_url: ${{ needs.create_release.outputs.upload_url }} # This is how it will be named on the release page. - asset_name: qjsc-${{ runner.os }}-${{ runner.arch }} + asset_name: qjsc-win32-${{ runner.arch }} # The path to the file you want to upload. - asset_path: ./qjsc + asset_path: ./qjsc.exe # set type of the file you are uploading asset_content_type: application/octet-stream + diff --git a/Makefile b/Makefile index 191f9a217..466f53222 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ ifeq ($(shell uname -s),Darwin) CONFIG_DARWIN=y endif # Windows cross compilation from Linux -CONFIG_WIN32=y +# CONFIG_WIN32=y # use link time optimization (smaller and faster executables but slower build) CONFIG_LTO=y # consider warnings as errors (for development) From 657d818fae06f3ace3c08b2d036a5db9b3478e12 Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 15:36:31 +0200 Subject: [PATCH 8/9] release pipeline update --- .github/workflows/release-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 963151ca0..f7dca5f58 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -20,7 +20,7 @@ jobs: draft: false prerelease: false release_assets_linux_mac: - name: Release Linux and MacOS assets + name: Release assets needs: create_release # we need to know the upload URL runs-on: ${{ matrix.platform }} # we run many different builds strategy: @@ -45,7 +45,7 @@ jobs: # set type of the file you are uploading asset_content_type: application/octet-stream release_assets_windows: - name: Release Windows assets + name: Release assets (Windows) needs: create_release # we need to know the upload URL runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: with: upload_url: ${{ needs.create_release.outputs.upload_url }} # This is how it will be named on the release page. - asset_name: qjsc-win32-${{ runner.arch }} + asset_name: qjsc-win32-${{ runner.arch }}.exe # The path to the file you want to upload. asset_path: ./qjsc.exe # set type of the file you are uploading From a9603404b2cdfa37f336cbf954607b0f32346cd6 Mon Sep 17 00:00:00 2001 From: Serhii Volovyk Date: Thu, 3 Nov 2022 15:37:22 +0200 Subject: [PATCH 9/9] release pipeline update --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 466f53222..49b1f6fa7 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ ifeq ($(shell uname -s),Darwin) CONFIG_DARWIN=y endif # Windows cross compilation from Linux -# CONFIG_WIN32=y +#CONFIG_WIN32=y # use link time optimization (smaller and faster executables but slower build) CONFIG_LTO=y # consider warnings as errors (for development)