Skip to content

Commit

Permalink
updates (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilipDeegan authored Mar 4, 2024
1 parent cee1fc2 commit e98443a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 25 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/build_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get mkn
uses: dawidd6/action-download-artifact@v2
with:
name: mkn
branch: master
workflow: build_nix.yml
repo: mkn/maiken
- run: uname -a

- env:
MKN_LIB_LINK_LIB: 1
KUL_GIT_CO: --depth 1
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix
chmod +x mkn
KLOG=2 ./mkn clean build run -dtOa "-std=c++17 -fPIC"
KLOG=2 ./mkn clean build run -dtOp test -a "-std=c++17 -fPIC"
11 changes: 3 additions & 8 deletions .github/workflows/build_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,15 @@ jobs:
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get mkn
uses: dawidd6/action-download-artifact@v2
with:
name: mkn
branch: master
workflow: build_osx.yml
repo: mkn/maiken
- run: uname -a

- env:
MKN_LIB_LINK_LIB: 1
KUL_GIT_CO: --depth 1
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
chmod +x mkn
KLOG=2 ./mkn clean build run -dtOa "-std=c++17 -fPIC"
KLOG=2 ./mkn clean build run -dtOp test -a "-std=c++17 -fPIC"
13 changes: 5 additions & 8 deletions .github/workflows/build_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,19 @@ jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get mkn
uses: dawidd6/action-download-artifact@v2
# setup MSVC compiler
- uses: ilammy/msvc-dev-cmd@v1
with:
name: mkn
branch: master
workflow: build_win.yml
repo: mkn/maiken
arch: amd64

- env:
KUL_GIT_CO: --depth 1
MKN_CL_PREFERRED: 1
shell: cmd
run: | # /bin/link interferes with cl/link.exe
bash -c "rm /bin/link"
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
bash -c 'curl -Lo mkn.exe https://github.com/mkn/mkn/releases/download/latest/mkn.exe'
bash -c 'KLOG=2 ./mkn clean build run -dtOa "-EHsc -std:c++17"'
bash -c 'KLOG=2 ./mkn clean build run -dtOp test -a "-EHsc -std:c++17"'
1 change: 1 addition & 0 deletions mod.pybind11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <cstdint>
#include <unordered_set>
#include "maiken/module/init.hpp"

Expand Down

0 comments on commit e98443a

Please sign in to comment.