Skip to content

Commit

Permalink
fix conflict on build.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
Tiaansu authored Oct 18, 2024
1 parent 88b2737 commit 6b9c086
Showing 1 changed file with 9 additions and 52 deletions.
61 changes: 9 additions & 52 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,47 +90,13 @@ jobs:
with:
name: streamer-win-debug-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
path: build/bin/Debug
build-linux-debug:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Declare github variables
id: vars
shell: bash
run: |
echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: install packages
run: sudo apt-get install g++-multilib

- name: Install CMake
uses: lukka/[email protected]

- name: Generate build files
run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug

- name: Build
run: |
cd build
cmake --build . --config Debug
build-linux:
runs-on: ubuntu-latest

- name: Get current time
uses: josStorer/get-current-time@v2
id: current-time
with:
format: YYYYMMDD
strategy:
matrix:
config: [Debug, Release]

- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: streamer-linux-debug-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
path: build/bin
build-linux-release:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -143,19 +109,10 @@ jobs:
echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: install packages
run: sudo apt-get install g++-multilib

- name: Install CMake
uses: lukka/[email protected]

- name: Generate build files
run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release

- name: Build
run: |
cd build
cmake --build . --config Release
cd docker
CONFIG=${{ matrix.config == 'Debug' && 'Debug' || 'MinSizeRel' }} ./build.sh
- name: Get current time
uses: josStorer/get-current-time@v2
Expand All @@ -166,5 +123,5 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: streamer-linux-release-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
path: build/bin
name: streamer-linux-${{ matrix.config == 'Debug' && 'debug' || 'release' }}-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
path: docker/build/bin

0 comments on commit 6b9c086

Please sign in to comment.