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: 450bfe1e3819
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: 5e0397565822
Choose a head ref
  • 10 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 23, 2020

  1. Add Upload Artifacts step

    kench authored Oct 23, 2020
    Copy the full SHA
    daf8a59 View commit details
  2. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    7dc23c0 View commit details
  3. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    96f8c04 View commit details
  4. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    d24a925 View commit details
  5. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    d4ebbce View commit details
  6. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    dad4421 View commit details
  7. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    9b02120 View commit details
  8. Copy the full SHA
    e7165cb View commit details
  9. Update build.yml

    Include gradients, shaders, and styles for Linux and remove duplicate line for Windows build artifacts.
    kench authored Oct 23, 2020
    Copy the full SHA
    71f5c74 View commit details
  10. Merge pull request #246 from kench/upload-artifacts

    Add support for uploading artifacts and enable Linux debug builds
    azonenberg authored Oct 23, 2020
    Copy the full SHA
    5e03975 View commit details
Showing with 33 additions and 1 deletion.
  1. +33 −1 .github/workflows/build.yml
34 changes: 33 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -24,8 +24,26 @@ jobs:
- name: Build
shell: bash
working-directory: ${{runner.workspace}}/scopehal-apps
run: mkdir build && cd build && cmake ../ && make -j4
run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_DOCS=ON ../ && make -j4

- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: glscopeclient-linux
path: |
build/src/glscopeclient/glscopeclient
build/src/glscopeclient/gradients/*
build/src/glscopeclient/shaders/*
build/src/glscopeclient/styles/*
build/lib/graphwidget/libgraphwidget.so
build/lib/scopehal/libscopehal.so
build/lib/scopeprotocols/libscopeprotocols.so
- name: Upload Documentation
uses: actions/upload-artifact@v2
with:
name: glscopeclient-manual
path: build/doc/glscopeclient-manual.pdf
windows:
runs-on: windows-latest

@@ -55,3 +73,17 @@ jobs:
- name: Build
working-directory: ${{runner.workspace}}/scopehal-apps
run: mkdir build && cd build && cmake -G"MinGW Makefiles" -DLIBFFTS_INCLUDE_DIR=/mingw64/include/ffts/ -DLIBFFTS_LIBRARIES=/mingw64/lib/libffts_static.a ./.. && mingw32-make -j4

- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: glscopeclient-windows
path: |
build/src/glscopeclient/glscopeclient.exe
build/src/glscopeclient/gradients/*
build/src/glscopeclient/shaders/*
build/src/glscopeclient/styles/*
build/lib/graphwidget/libgraphwidget.dll
build/lib/log/liblog.dll
build/lib/scopehal/libscopehal.dll
build/lib/scopeprotocols/libscopeprotocols.dll