Skip to content

Commit 82bf0d0

Browse files
Merge branch 'main' into bugfix/ZEN-wrong-path
2 parents 71a9149 + 971614c commit 82bf0d0

34 files changed

+991
-460
lines changed

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @SeanLeRoy @BrianWhitneyAI @aswallace

.github/pull_request_template.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## Context
2+
<!-- Describe the issues or requests addressed by this PR. Link to any relevant issues. -->
3+
4+
## Changes
5+
<!-- Describe the changes proposed in this PR. -->
6+
7+
## Testing
8+
<!-- Describe testing steps used to validate these changes, including automated and/or manual testing. -->
9+
10+
<!-- ## Screenshots (if relevant) -->

.github/workflows/manual-build.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- ubuntu-latest
1212
- windows-latest
1313
- macos-latest
14+
- macos-13
1415

1516
jobs:
1617
build:

dev-docs/04-versioning-and-deployment.md

+21-11
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,28 @@ builds of `packages/desktop`, prepare a draft Github release, and upload the bui
4545
6) [Update the GitHub release](https://github.com/AllenInstitute/biofile-finder/releases) once the Github action in Step 4 is finished, manually edit the Github release which was drafted as part of Step 4. Format its release name with the date (consistent with other release names), add a description of the changes, and optionally
4646
mark whether the release is "pre-release." If it is marked as "pre-release," it will not be accessible for download through the
4747
Github pages site.
48-
<!-- Added by Anya W 2025-01-07 -->
49-
7) **Temporary workaround for MacOS** (as of Jan 2025): GitHub Actions currently builds .dmg files that don't work for x86 processors and that are interpreted as "damaged" by new MacOS versions. To get around this, follow the instructions below to [manually build executables](#manually-building-an-executable). You will need to do this separately for both arm64 and x86, and each build process **must be done on a machine that uses the correct processor** (e.g., on a computer with an Intel chip for the x86 build).
50-
51-
After building, change the .dmg name to match the current tag number and the processor that the build is for (e.g., `BioFile Finder-tag.number-arm64.dmg` or `BioFile Finder-tag.number-x86_64.dmg`), and upload these to the release page. You may need to delete existing .dmg files from the release if GitHub has already generated them automatically.
5248

53-
If the build doesn't work (e.g., says it's damaged when downloaded from GitHub), change the `mac` build arch in `/desktop/package.json` from `"universal"` to whichever processor you're targeting (e.g., `"arm64"`).
49+
<!-- Added by Brian W 2025-02-18 -->
50+
7) **Temporary workaround for MacOS Intel Chipsets (as of Feb 2025):**
51+
GitHub Actions currently builds .dmg files that don't work for x86 processors and that are interpreted as "damaged" by new MacOS versions. The primary recommendation for building executables for Intel chipsets on MacOS is now to use the [manual-build](https://github.com/AllenInstitute/biofile-finder/actions/workflows/manual-build.yml) GitHub Action. This workflow automatically generates .dmg files for x86 architectures. To build the x86 version, ensure that you select the macOS-13 runner environment in the workflow, which is configured specifically for x86 builds. After the workflow completes, download, unzip and rename the .dmg file to include the current tag number and the target processor.
5452
55-
## Manually building an executable
56-
To manually build an executable for the desktop app, run the following from inside the `packages/desktop` directory:
53+
If additional customization is needed or if you encounter issues with the workflow, you can use the fallback option locally:
54+
<!-- Added by Anya W 2025-01-07 -->
55+
Navigate to the `packages/desktop` directory and run:
56+
```
57+
npm run build-executable
58+
```
59+
This command creates a build directory containing an install file (e.g., BioFile Finder-tag.number.dmg). After the build completes, rename the .dmg file to include the current tag number and the target processor (for example, BioFile Finder-tag.number-arm64.dmg or BioFile Finder-tag.number-x86_64.dmg), and upload the file to the release page. If GitHub has already generated .dmg files automatically, you may need to delete them before uploading your build.
60+
61+
62+
63+
### Development Builds for Specific Branches
64+
65+
You can generate development builds from any branch using the [manual-build](https://github.com/AllenInstitute/biofile-finder/actions/workflows/manual-build.yml) GitHub Action. Select the branch from the dropdown in the GitHub Action interface and choose the appropriate runner environment from the following options:
5766
```
58-
npm run build-executable
67+
ubuntu-latest for Linux builds
68+
windows-latest for Windows builds
69+
macOS-latest for ARM builds
70+
macOS-13 for x86 builds
5971
```
60-
This will create a `build` directory in `packages/desktop`, where it will package the app based on your current branch. The directory will contain an install file (e.g., `BioFile Finder-tag.number.dmg` if built on a Mac).
61-
62-
If needed, this install file can be manually added to a GitHub release. Note that this is currently necessary in order to release BFF for Macs that use Intel chips, since the GitHub workflow only generates working executables for ARM processors (Apple Silicon chips).
72+
Once you trigger the workflow, the process will generate a zipped artifact containing all the build artifacts. Download this artifact from the workflow, unzip it to access the build. Please note that these zipped artifacts are available for 7 days after which they are automatically deleted.

0 commit comments

Comments
 (0)