Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ Each job only runs if the previous job succeeds, providing a complete validation
### Release Workflow (`release-workflow.yaml`)

Triggered in the following scenarios:
- When a PR is merged to `master` (note: closing without merging won't trigger the release)
- When code is pushed directly to `master`
- When code is pushed to `master` (including PR merges)
- Manually from the GitHub Actions tab

Note: The workflow has been simplified to only trigger on push events to avoid running twice when PRs are merged.

This workflow has two sequential jobs:

1. **Release**:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
with:
particle-platform-name: 'bsom'
auto-version: ${{ github.event.inputs.force_version_increment == 'yes' }}
device-os-version: 6.1.1
device-os-version: 6.2.1

- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: particle-iot/compile-action@v1
with:
particle-platform-name: 'bsom'
device-os-version: 6.1.1
device-os-version: 6.2.1

- name: Download release artifacts
if: github.event.inputs.use_release_artifact == 'yes'
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/release-workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
name: Release Workflow

on:
# Runs on direct push to master
# Runs on direct push to master, but we'll check if it's from a PR merge in the job condition
push:
branches:
- master # or 'main' depending on your main branch

# Runs on PR completion (merge or close)
pull_request:
types:
- closed
branches:
- master # or 'main' depending on your main branch
# Removed pull_request trigger to avoid duplicate runs

# Allows manual triggering from the Actions tab
workflow_dispatch:
Expand All @@ -28,12 +23,9 @@ jobs:
release:
name: Compile and Release
# Run this job if:
# 1. Direct push to master, or
# 2. PR was merged (not just closed), or
# 3. Manually triggered
if: github.event_name == 'push' ||
(github.event_name == 'pull_request' && github.event.pull_request.merged == true) ||
github.event_name == 'workflow_dispatch'
# 1. Any push to master (including PR merges)
# 2. Manually triggered
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
outputs:
firmware-path: ${{ steps.compile.outputs.firmware-path }}
Expand All @@ -45,6 +37,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: Compile application
id: compile
Expand Down