RNS-Things/reticulum-meshchatX
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Enhance build configuration for macOS and update artifact naming #22

Merged
Sudo-Ivan merged 6 commits from universal-mac-build into master 2025-12-06 04:43:57 +00:00
Conversation 4 Commits 6 Files Changed 2 +8 -5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c95d2fd71c - Show all commits

13
.github/workflows/build.yml vendored
View File

@@ -59,7 +59,7 @@ jobs:
run: npm run build-frontend
- name: Upload frontend artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: frontend-build
path: meshchatx/public
@@ -79,18 +79,21 @@ jobs:
python: "3.12"
release_artifacts: "dist/*-win-installer.exe,dist/*-win-portable.exe"
build_input: build_windows
dist_script: dist-prebuilt
- name: mac
os: macos-14
node: 18
python: "3.11"
release_artifacts: "dist/*-mac-*.dmg"
build_input: build_mac
dist_script: dist:mac-universal
- name: linux
os: ubuntu-latest
node: 22
python: "3.12"
release_artifacts: "dist/*-linux.AppImage,dist/*-linux.deb,python-dist/*.whl"
build_input: build_linux
dist_script: dist-prebuilt
permissions:
contents: write
steps:
coderabbitai[bot] commented 2025-12-01 18:43:12 +00:00 (Migrated from github.com)
Review
Copy Link

⚠️ Potential issue | 🟠 Major

Artifact upload pattern may not match generated filenames with architecture suffix.

The release_artifacts pattern at line 86 was updated to dist/*-mac-*.dmg (to account for architecture), but the artifact upload at line 192 still uses the old pattern dist/*-mac.dmg. The new artifactName in package.json includes ${arch}, so generated files will be named like ReticulumMeshChat-v2.41.0-mac-universal.dmg, which matches the wildcard pattern at line 86 but the upload step at line 192 may not capture them correctly.

Update the artifact upload pattern to include architecture:

         path: |
           dist/*-win-installer.exe
           dist/*-win-portable.exe
-          dist/*-mac.dmg
+          dist/*-mac-*.dmg
           dist/*-linux.AppImage
           dist/*-linux.deb
           python-dist/*.whl

Also applies to: 192-192

🤖 Prompt for AI Agents 
.github/workflows/build.yml around lines 86 and 192: the release_artifacts
pattern was changed to include an architecture segment (`dist/*-mac-*.dmg` vs
`dist/*-mac.dmg`) but the artifact upload step still uses the old pattern and
will miss files named with `${arch}` (e.g.,
ReticulumMeshChat-v2.41.0-mac-universal.dmg); update the upload step's artifact
file pattern at line 192 to also include the architecture wildcard (e.g., change
`dist/*-mac.dmg` to `dist/*-mac-*.dmg`) and scan the file for any other
occurrences of the old pattern to make them consistent.

✅ Addressed in commits c95d2fd to d69a3e8

_⚠️ Potential issue_ | _🟠 Major_ **Artifact upload pattern may not match generated filenames with architecture suffix.** The `release_artifacts` pattern at line 86 was updated to `dist/*-mac-*.dmg` (to account for architecture), but the artifact upload at line 192 still uses the old pattern `dist/*-mac.dmg`. The new `artifactName` in package.json includes `${arch}`, so generated files will be named like `ReticulumMeshChat-v2.41.0-mac-universal.dmg`, which matches the wildcard pattern at line 86 but the upload step at line 192 may not capture them correctly. Update the artifact upload pattern to include architecture: ```diff path: | dist/*-win-installer.exe dist/*-win-portable.exe - dist/*-mac.dmg + dist/*-mac-*.dmg dist/*-linux.AppImage dist/*-linux.deb python-dist/*.whl ``` Also applies to: 192-192 <details> <summary>🤖 Prompt for AI Agents</summary> ``` .github/workflows/build.yml around lines 86 and 192: the release_artifacts pattern was changed to include an architecture segment (`dist/*-mac-*.dmg` vs `dist/*-mac.dmg`) but the artifact upload step still uses the old pattern and will miss files named with `${arch}` (e.g., ReticulumMeshChat-v2.41.0-mac-universal.dmg); update the upload step's artifact file pattern at line 192 to also include the architecture wildcard (e.g., change `dist/*-mac.dmg` to `dist/*-mac-*.dmg`) and scan the file for any other occurrences of the old pattern to make them consistent. ``` </details> <!-- This is an auto-generated comment by CodeRabbit --> ✅ Addressed in commits c95d2fd to d69a3e8
@@ -150,7 +153,7 @@ jobs:
if: |
github.event_name == 'push' ||
(github.event_name == 'workflow_dispatch' && inputs[matrix.build_input] == true)
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
name: frontend-build
path: meshchatx/public
@@ -177,7 +180,7 @@ jobs:
if: |
github.event_name == 'push' ||
(github.event_name == 'workflow_dispatch' && inputs[matrix.build_input] == true)
run: npm run dist-prebuilt
run: npm run ${{ matrix.dist_script }}
- name: Upload build artifacts
if: |
@@ -189,7 +192,7 @@ jobs:
path: |
dist/*-win-installer.exe
dist/*-win-portable.exe
dist/*-mac.dmg
dist/*-mac-*.dmg
dist/*-linux.AppImage
dist/*-linux.deb
python-dist/*.whl
@@ -204,7 +207,7 @@ jobs:
contents: write
steps:
- name: Download all artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
path: artifacts