Skip to content

Commit

Permalink
update msys and test others
Browse files Browse the repository at this point in the history
  • Loading branch information
adminfriso committed Mar 7, 2024
1 parent 4e1fa67 commit 1d20035
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 183 deletions.
File renamed without changes.
43 changes: 0 additions & 43 deletions .github/disabled/manual-nightly.yml

This file was deleted.

48 changes: 0 additions & 48 deletions .github/disabled/manual-web-examples.yml

This file was deleted.

42 changes: 0 additions & 42 deletions .github/disabled/nightly-linux64.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
name: build-emscripten

# make the action not run on the local repo if the branch is also in a pull request to OF/OF
on:
push:
if: github.event_name == 'push' && github.event.pull_request == null
paths-ignore:
- '**/*.md'
- 'examples/**'
pull_request:
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
paths-ignore:
- '**/*.md'
- 'examples/**'
on: [push]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -27,7 +17,23 @@ jobs:
env:
TARGET: ${{matrix.cfg.target}}
steps:
- uses: actions/checkout@v4
- name: checkout openframeworks
uses: actions/checkout@v4
with:
repository: openframeworks/openFrameworks
# now we add in ofxLaser as addon
- name: checkout ofxLaser
uses: actions/checkout@v4
with:
path: ${{ github.workspace }}/addons/ofxLaser
# and here we replace the empty example with the hello laser example
- name: remove emptyExample
run: rm -r ${{ github.workspace }}/examples/templates/emptyExample
- name: replace emptyExample with example_HelloLaser
run: cp -r ${{ github.workspace }}/addons/ofxLaser/example_HelloLaser ${{ github.workspace }}/examples/templates/emptyExample

# continue openframeworks defined pipeline

- name: Docker Step
run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash"
- name: Download libs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
name: build-ios-tvos

# make the action not run on the local repo if the branch is also in a pull request to OF/OF
on:
push:
if: github.event_name == 'push' && github.event.pull_request == null
paths-ignore:
- '**/*.md'
- 'examples/**'
pull_request:
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
paths-ignore:
- '**/*.md'
- 'examples/**'
on: [push]

env:
ccache: ccache
Expand All @@ -31,7 +21,23 @@ jobs:
env:
TARGET: ${{matrix.cfg.target}}
steps:
- uses: actions/checkout@v4
- name: checkout openframeworks
uses: actions/checkout@v4
with:
repository: openframeworks/openFrameworks
# now we add in ofxLaser as addon
- name: checkout ofxLaser
uses: actions/checkout@v4
with:
path: ${{ github.workspace }}/addons/ofxLaser
# and here we replace the empty example with the hello laser example
- name: remove emptyExample
run: rm -r ${{ github.workspace }}/examples/templates/emptyExample
- name: replace emptyExample with example_HelloLaser
run: cp -r ${{ github.workspace }}/addons/ofxLaser/example_HelloLaser ${{ github.workspace }}/examples/templates/emptyExample

# continue openframeworks defined pipeline

- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.12
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
name: build-linux-arm

# make the action not run on the local repo if the branch is also in a pull request to OF/OF
on:
push:
if: github.event_name == 'push' && github.event.pull_request == null
paths-ignore:
- '**/*.md'
- 'examples/**'
pull_request:
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
paths-ignore:
- '**/*.md'
- 'examples/**'
on: [push]

env:
ccache: ccache
Expand All @@ -37,7 +27,22 @@ jobs:
packages: make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good
version: 1.0

- uses: actions/checkout@v4
- name: checkout openframeworks
uses: actions/checkout@v4
with:
repository: openframeworks/openFrameworks
# now we add in ofxLaser as addon
- name: checkout ofxLaser
uses: actions/checkout@v4
with:
path: ${{ github.workspace }}/addons/ofxLaser
# and here we replace the empty example with the hello laser example
- name: remove emptyExample
run: rm -r ${{ github.workspace }}/examples/templates/emptyExample
- name: replace emptyExample with example_HelloLaser
run: cp -r ${{ github.workspace }}/addons/ofxLaser/example_HelloLaser ${{ github.workspace }}/examples/templates/emptyExample

# continue openframeworks defined pipeline
- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.12
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
name: build-linux64

# make the action not run on the local repo if the branch is also in a pull request to OF/OF
on:
push:
if: github.event_name == 'push' && github.event.pull_request == null
paths-ignore:
- '**/*.md'
- 'examples/**'
pull_request:
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
paths-ignore:
- '**/*.md'
- 'examples/**'
on: [push]

env:
ccache: ccache
Expand Down Expand Up @@ -40,7 +30,23 @@ jobs:
packages: make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good
version: 1.0

- uses: actions/checkout@v4
- name: checkout openframeworks
uses: actions/checkout@v4
with:
repository: openframeworks/openFrameworks
# now we add in ofxLaser as addon
- name: checkout ofxLaser
uses: actions/checkout@v4
with:
path: ${{ github.workspace }}/addons/ofxLaser
# and here we replace the empty example with the hello laser example
- name: remove emptyExample
run: rm -r ${{ github.workspace }}/examples/templates/emptyExample
- name: replace emptyExample with example_HelloLaser
run: cp -r ${{ github.workspace }}/addons/ofxLaser/example_HelloLaser ${{ github.workspace }}/examples/templates/emptyExample

# continue openframeworks defined pipeline

- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.12
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ jobs:
- name: Build
run: msys2 ./scripts/ci/msys2/build.sh

- name: Run tests
run: msys2 ./scripts/ci/msys2/run_tests.sh
# - name: Run tests
# run: msys2 ./scripts/ci/msys2/run_tests.sh

0 comments on commit 1d20035

Please sign in to comment.