Skip to content

Commit

Permalink
Update CI scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
marekmaskarinec committed Feb 19, 2024
1 parent e590654 commit b1d505b
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 24 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Build
on:
workflow_call:
jobs:
windows:
runs-on: windows-latest
steps:
- uses: ilammy/msvc-dev-cmd@v1
- name: Build with CMake+MSbuild
run: |
git submodule init
git submodule update --remote
./msbuild.bat
linux:
runs-on: ubuntu-20.04
steps:
- name: Install packages
run: sudo apt install -y openssh-client mesa-common-dev xorg-dev libxi-dev libxcursor-dev mingw-w64
- name: Update submodules
run: |
git submodule init
git submodule update --remote
- name: Build linux x86_64
run: make
- name: Build windows x86_64 (cross)
run: make cross
26 changes: 3 additions & 23 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,16 @@
name: Tophat workflow
name: Deploy workflow
on: [push]
jobs:
windows_build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
- name: Build with CMake+MSbuild
run: |
git submodule init
git submodule update --remote
./msbuild.bat
linux_build:
deploy:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Install packages
run: sudo apt install -y openssh-client mesa-common-dev xorg-dev libxi-dev libxcursor-dev mingw-w64
- uses: ./.github/workflows/build.yml
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SSH_KEY }}
known_hosts: ${{ secrets.KNOWN_HOSTS }}
- name: Update submodules
run: |
git submodule init
git submodule update --remote
- name: Build linux
run: make
- name: Build windows
run: make cross
- name: Deploy
run: |
rsync tophat [email protected]:www/tophat-web/dl/tophat-linux
Expand Down
2 changes: 1 addition & 1 deletion src/staembed.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "tophat.h"
#include "tophat.h"
const char *th_em_modulesrc[] = {
"\n"
"import (\n"
Expand Down

0 comments on commit b1d505b

Please sign in to comment.