Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ad9a3d46f530
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f0632c661426
Choose a head ref
  • 12 commits
  • 1 file changed
  • 2 contributors

Commits on May 17, 2021

  1. ci: update events

    @umarcor
    umarcor committed May 17, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3966b10 View commit details

  2. ci: style

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    b957ad2 View commit details

  3. ci: remove redundant 'shell' fields

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    0aa526e View commit details

  4. ci: use multiline 'run' fields

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    3ee8af4 View commit details

  5. ci: split job 'Tarball'

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    da28aa2 View commit details

  6. ci: remove redundant 'working-directory' fields

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    686259d View commit details

  7. ci/windows: use 'make' instead of 'mingw32-make'

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    98e134a View commit details

  8. ci/windows: use 'MSYS' Makefiles instead of 'MinGW'

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    9d926f2 View commit details

  9. ci/windows: do not use static FFTS, use dynamic

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    677ebbd View commit details

  10. ci/windows: build on MINGW64

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    d050f79 View commit details

  11. ci: clone and build dependencies in a single step

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    5dab43e View commit details

  12. Merge pull request #352 from umarcor/msys2 

    CI workflow updates
    @azonenberg
    azonenberg authored May 17, 2021
    Copy the full SHA
    f0632c6 View commit details
Showing with 114 additions and 42 deletions.
  1. +114 −42 .github/workflows/build.yml
156 changes: 114 additions & 42 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,101 @@
name: Build

on: [push]
on:
push:
pull_request:
schedule:
- cron: '0 0 * * 5'
workflow_dispatch:

jobs:
linux:


Tarball:
runs-on: ubuntu-latest

steps:

- uses: actions/checkout@v2
with:
submodules: recursive

- name: Make Source Tarball
shell: bash
working-directory: ${{runner.workspace}}
run: tar -cf source.tar scopehal-apps && gzip -S .gz -9 source.tar
run: |
cd ..
tar -cf source.tar scopehal-apps
gzip -S .gz -9 source.tar
mv source.tar.gz scopehal-apps/
- name: Install Dependencies
run: sudo apt-get -y install build-essential cmake pkg-config libglm-dev libgtkmm-3.0-dev libsigc++-2.0-dev libyaml-cpp-dev liblxi-dev texlive texlive-fonts-extra libglew-dev
- name: Upload Source
uses: actions/upload-artifact@v2
with:
name: glscopeclient-source
path: source.tar.gz

- name: Clone FFTS Repository
run: git clone https://github.com/anthonix/ffts.git /tmp/ffts

- name: Build FFTS Library
shell: bash
run: pushd /tmp/ffts && mkdir build && cd build && cmake .. -DENABLE_SHARED=ON && make -j4 && sudo make install && popd
Linux:
runs-on: ubuntu-latest

- name: Clone Catch2 Repository
run: git clone https://github.com/catchorg/Catch2 /tmp/catch2
steps:

- name: Build Catch2 Library
shell: bash
run: pushd /tmp/catch2 && git checkout v2.13.2 && mkdir build && cd build && cmake .. && make -j 4 && sudo make install && popd
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Install Dependencies
run: |
sudo apt-get -y install \
build-essential \
cmake \
pkg-config \
libglm-dev \
libgtkmm-3.0-dev \
libsigc++-2.0-dev \
libyaml-cpp-dev \
liblxi-dev \
texlive \
texlive-fonts-extra \
libglew-dev
- name: Clone and Build FFTS Library
run: |
git clone https://github.com/anthonix/ffts.git /tmp/ffts
pushd /tmp/ffts
mkdir build
cd build
cmake \
-DENABLE_SHARED=ON \
..
make -j4
sudo make install
popd
- name: Clone and Build Catch2 Library
run: |
git clone https://github.com/catchorg/Catch2 /tmp/catch2
pushd /tmp/catch2
git checkout v2.13.2
mkdir build
cd build
cmake ..
make -j 4
sudo make install
popd
- name: Build
shell: bash
working-directory: ${{runner.workspace}}/scopehal-apps
run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_DOCS=ON ../ && make -j4
run: |
mkdir build
cd build
cmake \
-DCMAKE_BUILD_TYPE=DEBUG \
-DBUILD_DOCS=ON \
..
make -j4
- name: Run Tests
shell: bash
working-directory: ${{runner.workspace}}/scopehal-apps
run: cd build && make test

- name: Upload Source
uses: actions/upload-artifact@v2
with:
name: glscopeclient-source
path: ${{runner.workspace}}/source.tar.gz
run: |
cd build
make test
- name: Upload Artifacts
uses: actions/upload-artifact@v2
@@ -67,35 +115,59 @@ jobs:
with:
name: glscopeclient-manual
path: build/doc/glscopeclient-manual.pdf
windows:


Windows:
runs-on: windows-latest

defaults:
run:
shell: msys2 {0}

steps:

- uses: actions/checkout@v2
with:
submodules: recursive

- uses: msys2/setup-msys2@v2
with:
update: true
install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-glm mingw-w64-x86_64-libsigc++ mingw-w64-x86_64-gtkmm3 mingw-w64-x86_64-yaml-cpp mingw-w64-x86_64-glew

- name: Clone FFTS Repository
shell: bash
working-directory: ${{runner.workspace}}
run: git clone https://github.com/anthonix/ffts.git

- name: Build FFTS Library
working-directory: ${{runner.workspace}}/ffts
run: mkdir build && cd build && cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX -DENABLE_SHARED=ON .. && mingw32-make -j4 && mingw32-make install
msystem: MINGW64
install: >-
git
make
mingw-w64-x86_64-gcc
mingw-w64-x86_64-cmake
mingw-w64-x86_64-glm
mingw-w64-x86_64-libsigc++
mingw-w64-x86_64-gtkmm3
mingw-w64-x86_64-yaml-cpp
mingw-w64-x86_64-glew
- name: Clone and Build FFTS Library
run: |
git clone https://github.com/anthonix/ffts.git ../ffts
cd ../ffts
mkdir build
cd build
cmake \
-G"MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX \
-DENABLE_SHARED=ON \
..
make -j4
make install
- name: Build
working-directory: ${{runner.workspace}}/scopehal-apps
run: mkdir build && cd build && cmake -G"MinGW Makefiles" -DBUILD_TESTING=OFF -DLIBFFTS_INCLUDE_DIR=/mingw64/include/ffts/ -DLIBFFTS_LIBRARIES=/mingw64/lib/libffts_static.a ./.. && mingw32-make -j4
run: |
mkdir build
cd build
cmake \
-G"MSYS Makefiles" \
-DBUILD_TESTING=OFF \
..
make -j4
- name: Upload Artifacts
uses: actions/upload-artifact@v2