From b9fe7340cbebc0f830f08caddea34e0cd20e92de Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Tue, 4 Jun 2024 14:31:59 +0100 Subject: [PATCH] chore: bake inso-cli on older macos [INS-3931] (#7471) * chore: bake inso-cli on older macos [INS-3931] * send PKG_NAME var for macos builds * macos-13 only * Revert "send PKG_NAME var for macos builds" This reverts commit dcd6f2b13b2b8c376e2c97b85f98718e74bcfcfa. * Update .github/workflows/release-start.yml --- .github/workflows/release-build.yml | 20 +++++++++-------- .github/workflows/release-start.yml | 34 ++++++++++------------------- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 85320ac770..0f6261fc28 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -17,7 +17,9 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest + # macos-13 supports both intel and apple sillicon on inso cli properly + # macos-latest is defaulting to apple sillicon and breaks inso cli retrocompatibility + - os: macos-13 csc_link_secret: DESIGNER_MAC_CSC_LINK csc_key_password_secret: DESIGNER_MAC_CSC_KEY_PASSWORD - os: windows-latest @@ -41,18 +43,18 @@ jobs: run: npm ci - name: Package app (MacOS only) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' shell: bash run: npm run app-package env: NODE_OPTIONS: '--max_old_space_size=6144' - APPLE_ID: ${{ matrix.os == 'macos-latest' && secrets.DESIGNER_APPLE_ID || '' }} - APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.os == 'macos-latest' && secrets.DESIGNER_APPLE_ID_PASSWORD || '' }} + APPLE_ID: ${{ matrix.os == 'macos-13' && secrets.DESIGNER_APPLE_ID || '' }} + APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.os == 'macos-13' && secrets.DESIGNER_APPLE_ID_PASSWORD || '' }} CSC_LINK: ${{ matrix.csc_link_secret != '' && secrets[matrix.csc_link_secret] || '' }} CSC_KEY_PASSWORD: ${{ matrix.csc_key_password_secret != '' && secrets[matrix.csc_key_password_secret] || '' }} - name: Package app (Windows and Linux) - if: matrix.os != 'macos-latest' + if: matrix.os != 'macos-13' shell: bash run: npm run app-package env: @@ -71,7 +73,7 @@ jobs: VERSION: ${{ env.INSO_VERSION }} - name: Code-sign & create Inso CLI installer (macOS only) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' run: ./src/scripts/macos-pkg.sh shell: bash working-directory: packages/insomnia-inso @@ -84,7 +86,7 @@ jobs: VERSION: ${{ env.INSO_VERSION }} - name: Notarize Inso CLI installer (macOS only) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' uses: lando/notarize-action@v2 with: product-path: packages/insomnia-inso/artifacts/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg @@ -94,13 +96,13 @@ jobs: appstore-connect-team-id: FX44YY62GV - name: Staple Inso CLI installer (macOS only) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' uses: BoundfoxStudios/action-xcode-staple@v1 with: product-path: packages/insomnia-inso/artifacts/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg - name: Notarize Inso CLI binary (macOS only) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' uses: lando/notarize-action@v2 with: product-path: packages/insomnia-inso/binaries/inso diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml index 1fca6cd5e8..efdea674ad 100644 --- a/.github/workflows/release-start.yml +++ b/.github/workflows/release-start.yml @@ -48,20 +48,15 @@ jobs: if: github.event.inputs.channel == 'stable' && github.event.inputs.version run: npm --workspaces version "${{ github.event.inputs.version }}" - # handle new "major" beta releases, e.g. 10.0, 11.0, 12.0 ... - - name: App version (alpha/beta, with new general version) - if: github.event.inputs.channel != 'stable' && github.event.inputs.version && !contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") - run: npm --workspaces version "${{ github.event.inputs.version }}-${{ github.event.inputs.channel }}.0" - - # handle botched alpha/beta releases, e.g. for iterations that were merged before running release-publish - - name: App version (alpha/beta, with a specific version) - if: github.event.inputs.channel != 'stable' && github.event.inputs.version && contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") - run: npm --workspaces version "${{ github.event.inputs.version }}" - - - name: App version (alpha/beta, patch latest) + - name: App version (alpha/beta, patch latest alpha/beta) if: github.event.inputs.channel != 'stable' && !github.event.inputs.version run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease + - name: App version (alpha/beta, with a specific version) + if: github.event.inputs.channel != 'stable' && github.event.inputs.version + run: npm --workspaces version "${{ github.event.inputs.version }}" + + # ############################################################ - name: Get version @@ -103,19 +98,14 @@ jobs: if: github.event.inputs.channel == 'stable' && github.event.inputs.version run: npm --workspaces version "${{ github.event.inputs.version }}" - # handle new "major" beta releases, e.g. 10.0, 11.0, 12.0 ... - - name: (Re-run) App version (alpha/beta, with new general version) - if: github.event.inputs.channel != 'stable' && github.event.inputs.version && !contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") - run: npm --workspaces version "${{ github.event.inputs.version }}-${{ github.event.inputs.channel }}.0" - - # handle botched alpha/beta releases, e.g. for iterations that were merged before running release-publish - - name: (Re-run) App version (alpha/beta, with a specific version) - if: github.event.inputs.channel != 'stable' && github.event.inputs.version && contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") - run: npm --workspaces version "${{ github.event.inputs.version }}" - - - name: (Re-run) App version (alpha/beta, patch latest) + - name: (Re-run) App version (alpha/beta, patch latest alpha/beta) if: github.event.inputs.channel != 'stable' && !github.event.inputs.version run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease + + - name: (Re-run) App version (alpha/beta, with a specific version) + if: github.event.inputs.channel != 'stable' && github.event.inputs.version + run: npm --workspaces version "${{ github.event.inputs.version }}" + # ############################################################ - name: Git Commit