Skip to content

Commit

Permalink
streamline gh actions
Browse files Browse the repository at this point in the history
  • Loading branch information
counter185 committed Sep 16, 2024
1 parent da09536 commit 43a1c44
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 39 deletions.
36 changes: 0 additions & 36 deletions .github/workflows/c-cpp.yml

This file was deleted.

34 changes: 31 additions & 3 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# separate terms of service, privacy policy, and support
# documentation.

name: MSBuild
name: Build (win64 and linux64)

on:
push:
Expand All @@ -24,7 +24,7 @@ permissions:
contents: read

jobs:
build:
build-windows64:
runs-on: windows-latest

steps:
Expand Down Expand Up @@ -60,4 +60,32 @@ jobs:
with:
name: voidsprite-build
path: |
x64/Release
x64/Release
build-linux64:

runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4

- name: install g++13
run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt-get update -y && sudo apt-get install g++-13

- name: install devlibs
run: sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev zlib1g-dev libpng-dev

- name: make
run: make
working-directory: gcc-build

- name: add licenses
run: cp -r ../OPEN_SOURCE_LICENSES ./build/
working-directory: gcc-build

- name: Push build artifacts
uses: actions/upload-artifact@v4
with:
name: voidsprite-build-linux
path: |
gcc-build/build
1 change: 1 addition & 0 deletions freesprite/FileIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ inline void g_setupIO() {
}
}

//todo: do the same to importers at some point
inline std::vector<FileSessionImportNPath> g_fileSessionImportersNPaths = {
{
"voidsprite Session", ".voidsn", &readVOIDSN
Expand Down

0 comments on commit 43a1c44

Please sign in to comment.