Skip to content

Commit

Permalink
Merge pull request #9 from oblivioncth/dev
Browse files Browse the repository at this point in the history
Merge to master for v1.15.1.2
  • Loading branch information
oblivioncth authored Sep 2, 2024
2 parents 5792f4d + 464647a commit dc5a71c
Show file tree
Hide file tree
Showing 14 changed files with 102 additions and 345 deletions.
89 changes: 0 additions & 89 deletions .github/workflows/build-libsquish-linux.yml

This file was deleted.

91 changes: 0 additions & 91 deletions .github/workflows/build-libsquish-windows.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .github/workflows/build-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build Project
on:
workflow_dispatch:
push:
branches-ignore:
- 'master'
workflow_run:
workflows: Tag and Sync
types: completed
branches: dev
# This is the branch that the original workflow ran on, which is technically dev, due to how
# the "pull_request" trigger works (it works off master correctly for a merged PR but is triggered
# by dev

jobs:
trigger-build:
name: Build Project
if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
uses: oblivioncth/actions/.github/workflows/build-cxx-project.yml@v1
secrets:
ffynnon_access: ${{ secrets.OBYBOT_FFYNNON_ACCESS }}
with:
pre_build_steps: |
- name: Install OpenMP lib [Linux]
if: env.run_is_linux == 'true'
shell: pwsh
run: |
if($Env:run_compiler.StartsWith('g++-')) {
sudo apt-get install libgomp1
} elseif($Env:run_compiler.StartsWith('clang++-')) {
$ver = $Env:run_compiler.replace('clang++-', '')
$pkg = "libomp-${ver}-dev"
sudo apt-get install $pkg
}
10 changes: 10 additions & 0 deletions .github/workflows/check-release-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Check Release PR
on:
pull_request:
types: [opened, synchronize, reopened]
branches: master

jobs:
check-pr-correctness:
name: Release PR Correctness Check
uses: oblivioncth/actions/.github/workflows/validate-release-pr.yml@v1
19 changes: 19 additions & 0 deletions .github/workflows/generate-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Generate Release
on:
workflow_run:
workflows: Build Project
types: completed
branches: master

jobs:
generate-release:
name: Generate Release
permissions:
actions: read
contents: write
pages: write
id-token: write
if: github.event.workflow_run.conclusion == 'success'
uses: oblivioncth/actions/.github/workflows/generate-cxx-release.yml@v1
with:
artifacts_run_id: ${{ github.event.workflow_run.id }}
12 changes: 12 additions & 0 deletions .github/workflows/label-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Label PR
on:
pull_request_target:
types: [opened, synchronize, reopened]

jobs:
label-pr:
name: Label pull-request
permissions:
contents: read
pull-requests: write
uses: oblivioncth/actions/.github/workflows/label-pr.yml@v1
13 changes: 0 additions & 13 deletions .github/workflows/master-pull-request-checks.yml

This file was deleted.

112 changes: 0 additions & 112 deletions .github/workflows/master-pull-request-merge-reaction.yml

This file was deleted.

Loading

0 comments on commit dc5a71c

Please sign in to comment.