Skip to content

Commit

Permalink
Merge pull request #58 from oblivioncth/dev
Browse files Browse the repository at this point in the history
Merge to master for v0.7.5.3
  • Loading branch information
oblivioncth authored Oct 11, 2024
2 parents 9fef6f7 + 3ec58d4 commit a7f5de5
Show file tree
Hide file tree
Showing 34 changed files with 422 additions and 506 deletions.
11 changes: 10 additions & 1 deletion .github/release.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
changelog:
exclude:
labels:
- release-pr
- release
- common-sync
authors:
- oby-bot
categories:
- title: Breaking Changes
labels:
- breaking
- title: New Features
labels:
- enhancement
- title: Bug Fixes
labels:
- bug
- title: Implementation Improvements
labels:
- implementation
- title: Other Changes
labels:
- "*"
72 changes: 0 additions & 72 deletions .github/workflows/build-fil-windows.yml

This file was deleted.

29 changes: 29 additions & 0 deletions .github/workflows/build-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
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:
runs_exclude: >
[
{ "os": "windows-latest", "linkage": "shared" },
{ "os": "ubuntu-20.04"},
{ "os": "ubuntu-22.04"}
]
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
50 changes: 50 additions & 0 deletions .github/workflows/generate-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Generate Release
on:
workflow_run:
workflows: Build Project
types: completed
branches: master

jobs:
create-release-suffix:
name: Create Release Name Suffix
if: github.event.workflow_run.conclusion == 'success'
runs-on: ubuntu-latest
outputs:
suffix: ${{ steps.form_suffix.outputs.suffix }}
steps:
- name: Checkout project
uses: actions/checkout@v4
- name: Get target FP version
id: check_target_fp
env:
match_start: set\(TARGET_FP_VERSION_PREFIX
match_end: \)
shell: pwsh
run: |
$project_lists = Get-Content -Raw CMakeLists.txt
if(!($project_lists -match '(?<=${{ env.match_start }})(.*)(?=${{ env.match_end }})')){
throw "Could not get target FP version!"
}
$target_version = "v$($Matches[1].Trim())"
echo "fp_version=$target_version" >> $Env:GITHUB_ENV
- name: Form suffix
id: form_suffix
run: |
suffix="(Targets FP $fp_version)"
echo "suffix=$suffix" >> $GITHUB_OUTPUT
generate-release:
name: Generate Release
needs: create-release-suffix
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 }}
name_suffix: ${{ needs.create-release-suffix.outputs.suffix }}

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.

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

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/pull-request-labeler.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/push-reaction.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/tag-release-commit-and-sync-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Tag and Sync
on:
pull_request:
types: [closed]
branches:
- 'master'

jobs:
tag_master_and_sync_dev:
name: Tag master merge commit, FF back to dev
if: github.event.pull_request.merged == true
permissions:
contents: write
uses: oblivioncth/actions/.github/workflows/tag-main-and-sync-dev.yml@v1
Loading

0 comments on commit a7f5de5

Please sign in to comment.