Skip to content

Commit ed6619b

Browse files
jcelerierclaude
andcommitted
ci: consolidate to merged refs (avendish main + actions @master)
avendish#105 and ossia/actions#9 are merged, so: - re-pin avendish to main (7f7dac9, the embind link-order fix) - point both workflows at ossia/actions ...@master - drop the testing-only migrate-avnd-addon push trigger and the workflow_dispatch/pull_request types scaffolding Final shipping config for the template. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 355bfed commit ed6619b

3 files changed

Lines changed: 6 additions & 13 deletions

File tree

.github/workflows/builds.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@ name: Build
22

33
on:
44
pull_request:
5-
types: [opened, synchronize, reopened, edited]
65
push:
7-
branches: [main, master, migrate-avnd-addon]
6+
branches: [main, master]
87
tags: ['v*']
9-
workflow_dispatch:
108

119
concurrency:
1210
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1311
cancel-in-progress: true
1412

1513
jobs:
1614
ci:
17-
# Pinned to the feature branch while it's in review. Switch to @master once
18-
# ossia/actions PR (drop-ossia-sdk-dep) lands.
19-
uses: ossia/actions/.github/workflows/avnd-addon.yml@drop-ossia-sdk-dep
15+
uses: ossia/actions/.github/workflows/avnd-addon.yml@master
2016
secrets: inherit
2117
with:
2218
pd: true

.github/workflows/portability.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ name: Portability
33
on:
44
pull_request:
55
push:
6-
# migrate-avnd-addon is the in-review branch; drop it once this lands on main.
7-
branches: [main, master, migrate-avnd-addon]
6+
branches: [main, master]
87

98
concurrency:
10-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
9+
group: ${{ github.workflow }}-portability-${{ github.event.pull_request.number || github.ref }}
1110
cancel-in-progress: true
1211

1312
jobs:
1413
smoke:
15-
# Pinned to the feature branch while it's in review. Switch to @master once
16-
# ossia/actions PR (drop-ossia-sdk-dep) lands.
17-
uses: ossia/actions/.github/workflows/avnd-portability.yml@drop-ossia-sdk-dep
14+
uses: ossia/actions/.github/workflows/avnd-portability.yml@master
1815
secrets: inherit
1916
with:
2017
# iOS off: Xcode multi-config intermediate-path plumbing fails for an

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if(NOT Avendish_FOUND)
1010
FetchContent_Declare(
1111
Avendish
1212
GIT_REPOSITORY "https://github.com/celtera/avendish"
13-
GIT_TAG 1d90a1527ba8b2f26189d9c06e6977562a5e39ec)
13+
GIT_TAG 7f7dac9)
1414
FetchContent_Populate(Avendish)
1515
list(APPEND CMAKE_PREFIX_PATH "${avendish_SOURCE_DIR}")
1616
find_package(Avendish REQUIRED)

0 commit comments

Comments
 (0)