Skip to content

Commit

Permalink
Merge pull request #1049 from JulianGro/disable_master
Browse files Browse the repository at this point in the history
Cut back on master builds.
  • Loading branch information
JulianGro authored Jun 29, 2024
2 parents a91ae5a + bd5f3a1 commit e80853a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/linux_server_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ on:
pull_request:
types: [opened, synchronize, reopened, labeled]
push:
branches:
- master
tags:
# Release tags. E.g. 2024.06.1
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/master_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,12 @@ jobs:
working-directory: ${{runner.workspace}}/build
run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log

- name: Upload artifact
if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') || matrix.build_type == 'android' # Automatic Linux packaging is not implemented
shell: bash
working-directory: ${{runner.workspace}}/build
env:
AWS_ACCESS_KEY_ID: ${{ secrets.s3_access_key_id }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.s3_secret_access_key }}
run: $PYTHON_EXEC $GITHUB_WORKSPACE/tools/ci-scripts/upload.py
- name: Upload artifact to GitHub
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT_PATTERN }}
path: ./build/${{ env.ARTIFACT_PATTERN }}
if-no-files-found: error

#- name: Archive symbols
# if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')
Expand Down

0 comments on commit e80853a

Please sign in to comment.