Skip to content

Commit 94eb57e

Browse files
Update CI scripts
Signed-off-by: Marek Maškarinec <[email protected]>
1 parent e590654 commit 94eb57e

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

.github/actions/build/action.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Linux Build
2+
runs:
3+
using: "composite"
4+
steps:
5+
- name: Install packages
6+
run: sudo apt install -y openssh-client mesa-common-dev xorg-dev libxi-dev libxcursor-dev mingw-w64
7+
- name: Update submodules
8+
shell: bash
9+
run: |
10+
git submodule init
11+
git submodule update --remote
12+
- name: Build linux x86_64
13+
shell: bash
14+
run: make
15+
- name: Build windows x86_64 (cross)
16+
shell: bash
17+
run: make cross
18+

.github/workflows/package.yml

+4-24
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,16 @@
1-
name: Tophat workflow
1+
name: Deploy workflow
22
on: [push]
33
jobs:
4-
windows_build:
5-
runs-on: windows-latest
6-
steps:
7-
- uses: actions/checkout@v2
8-
- uses: ilammy/msvc-dev-cmd@v1
9-
- name: Build with CMake+MSbuild
10-
run: |
11-
git submodule init
12-
git submodule update --remote
13-
./msbuild.bat
14-
15-
linux_build:
4+
deploy:
165
runs-on: ubuntu-20.04
176
steps:
18-
- uses: actions/checkout@v2
19-
- name: Install packages
20-
run: sudo apt install -y openssh-client mesa-common-dev xorg-dev libxi-dev libxcursor-dev mingw-w64
7+
- uses: actions/checkout@v3
8+
- uses: ./.github/actions/build
219
- name: Install SSH key
2210
uses: shimataro/ssh-key-action@v2
2311
with:
2412
key: ${{ secrets.SSH_KEY }}
2513
known_hosts: ${{ secrets.KNOWN_HOSTS }}
26-
- name: Update submodules
27-
run: |
28-
git submodule init
29-
git submodule update --remote
30-
- name: Build linux
31-
run: make
32-
- name: Build windows
33-
run: make cross
3414
- name: Deploy
3515
run: |
3616
rsync tophat [email protected]:www/tophat-web/dl/tophat-linux

src/staembed.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "tophat.h"
1+
#include "tophat.h"
22
const char *th_em_modulesrc[] = {
33
"\n"
44
"import (\n"

0 commit comments

Comments
 (0)