Skip to content

Commit

Permalink
Merge pull request #51 from altmp/rc
Browse files Browse the repository at this point in the history
merge rc to release

Former-commit-id: 8409251
  • Loading branch information
LeonMrBonnie authored Jul 16, 2021
2 parents 308ff49 + 4b2561f commit 7392961
Show file tree
Hide file tree
Showing 192 changed files with 17,244 additions and 7,819 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Build & deploy
on:
create:
push:
branches-ignore:
- '**'
tags:
- 'dev/*.*-dev*'
- 'rc/*.*-rc*'
Expand Down Expand Up @@ -64,13 +66,16 @@ jobs:
- name: Build
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install gcc-8 g++-8
mkdir build-linux && cd build-linux
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-8 -DJS_MODULE_VERSION=%VERSION% ..
cmake --build . --config Release
cd ..
mkdir -p dist/modules/js-module
cp ./build-linux/libjs-module.so dist/modules/js-module
cp ./deps/nodejs/lib/libnode.so.72 dist/modules/js-module
cp ./deps/nodejs/lib/libnode.so.83 dist/modules/js-module
env:
VERSION: ${{ steps.version.outputs.VERSION }}

Expand Down Expand Up @@ -196,7 +201,7 @@ jobs:
delete-artifacts:
name: Delete artifacts
runs-on: ubuntu-18.04
needs: [create-release]
needs: [ create-release, deploy-cdn ]
if: ${{ always() }}
steps:
- name: Delete artifacts
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/test-changes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Test changes
on: [pull_request]

jobs:
test-windows:
name: Test changes on Windows
runs-on: windows-2019
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
submodules: recursive
lfs: true

- name: Build
shell: cmd
run: |
mkdir build
pushd build
cmake -G"Visual Studio 16" -A x64 ..
cmake --build . --config Release
test-linux:
name: Test changes on Linux
runs-on: ubuntu-18.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
submodules: recursive
lfs: true

- name: Build
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install gcc-8 g++-8
mkdir build-linux && cd build-linux
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-8 ..
cmake --build . --config Release
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ add_library(
)

if (WIN32)
target_link_libraries(${PROJECT_NAME} libnode.lib v8_libplatform.lib v8_libbase.lib dbghelp.lib winmm.lib shlwapi.lib)
target_link_libraries(${PROJECT_NAME} libnode.lib dbghelp.lib winmm.lib shlwapi.lib)
endif (WIN32)

if (UNIX)
target_link_libraries(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/deps/nodejs/lib/libnode.so.72)
target_link_libraries(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/deps/nodejs/lib/libnode.so.83)
endif (UNIX)
3 changes: 0 additions & 3 deletions deploy.bat

This file was deleted.

Loading

0 comments on commit 7392961

Please sign in to comment.