From 261b1f2a4c3175510e73bf194e17036e707eb577 Mon Sep 17 00:00:00 2001 From: SeanLeRoy Date: Tue, 25 Feb 2025 16:35:24 -0800 Subject: [PATCH 1/2] Remove x86 build --- .github/workflows/manual-build.yml | 46 ------------------------ dev-docs/04-versioning-and-deployment.md | 14 -------- 2 files changed, 60 deletions(-) delete mode 100644 .github/workflows/manual-build.yml diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml deleted file mode 100644 index 117a4be1..00000000 --- a/.github/workflows/manual-build.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: manual-build - -on: - workflow_dispatch: - inputs: - os: - description: "Operating System" - required: true - type: choice - options: - - ubuntu-latest - - windows-latest - - macos-latest - - macos-13 - -jobs: - build: - runs-on: ${{ github.event.inputs.os }} - - steps: - - name: Check out Git repository - uses: actions/checkout@v4 - - - name: Install Node.js - uses: actions/setup-node@v4 - with: - node-version: 18 - - - name: Build/release Electron app - uses: AllenCellSoftware/action-electron-builder@fms-file-explorer - env: - AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} - with: - github_token: ${{ secrets.github_token }} - package_root: "packages/desktop" - release: false # No release, just build - windows_certs: ${{ secrets.CSC_LINK }} - windows_certs_password: ${{ secrets.CSC_KEY_PASSWORD }} - - - name: Upload build artifacts - uses: actions/upload-artifact@v4 - with: - name: electron-build-${{ github.event.inputs.os }} - path: | - packages/desktop/build - retention-days: 7 # Artifacts will be stored for 7 days \ No newline at end of file diff --git a/dev-docs/04-versioning-and-deployment.md b/dev-docs/04-versioning-and-deployment.md index f6c3da28..f5bcec7e 100644 --- a/dev-docs/04-versioning-and-deployment.md +++ b/dev-docs/04-versioning-and-deployment.md @@ -46,20 +46,6 @@ builds of `packages/desktop`, prepare a draft Github release, and upload the bui mark whether the release is "pre-release." If it is marked as "pre-release," it will not be accessible for download through the Github pages site. - -7) **Temporary workaround for MacOS Intel Chipsets (as of Feb 2025):** - 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. - - If additional customization is needed or if you encounter issues with the workflow, you can use the fallback option locally: - - Navigate to the `packages/desktop` directory and run: - ``` - npm run build-executable - ``` - 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. - - - ### Development Builds for Specific Branches 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: From 1556cbf2b47ddda3359c26e0d0570d0dc2f035f3 Mon Sep 17 00:00:00 2001 From: SeanLeRoy Date: Wed, 26 Feb 2025 11:17:27 -0800 Subject: [PATCH 2/2] Add manual build back --- .github/workflows/manual-build.yml | 45 ++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/manual-build.yml diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml new file mode 100644 index 00000000..cbebac29 --- /dev/null +++ b/.github/workflows/manual-build.yml @@ -0,0 +1,45 @@ +name: manual-build + +on: + workflow_dispatch: + inputs: + os: + description: "Operating System" + required: true + type: choice + options: + - ubuntu-latest + - windows-latest + - macos-latest + +jobs: + build: + runs-on: ${{ github.event.inputs.os }} + + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version: 18 + + - name: Build/release Electron app + uses: AllenCellSoftware/action-electron-builder@fms-file-explorer + env: + AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} + with: + github_token: ${{ secrets.github_token }} + package_root: "packages/desktop" + release: false # No release, just build + windows_certs: ${{ secrets.CSC_LINK }} + windows_certs_password: ${{ secrets.CSC_KEY_PASSWORD }} + + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: electron-build-${{ github.event.inputs.os }} + path: | + packages/desktop/build + retention-days: 7 # Artifacts will be stored for 7 days