Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bake inso-cli on older macos [INS-3931] #7471

Merged
merged 5 commits into from
Jun 4, 2024
Merged

chore: bake inso-cli on older macos [INS-3931] #7471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dceebf
chore: bake inso-cli on older macos [INS-3931]
filfreire May 31, 2024
dcd6f2b
send PKG_NAME var for macos builds
filfreire May 31, 2024
41d5a2b
macos-13 only
filfreire Jun 3, 2024
b62f92e
Revert "send PKG_NAME var for macos builds"
filfreire Jun 3, 2024
c5cef9e
Update .github/workflows/release-start.yml
filfreire Jun 4, 2024
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
20 changes: 11 additions & 9 deletions .github/workflows/release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
26 changes: 8 additions & 18 deletions .github/workflows/release-start.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,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 ...
filfreire marked this conversation as resolved.
Show resolved Hide resolved
- 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"
- 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

# 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 }}")
if: github.event.inputs.channel != 'stable' && github.event.inputs.version
run: npm --workspaces version "${{ github.event.inputs.version }}"

- name: App version (alpha/beta, patch latest)
if: github.event.inputs.channel != 'stable' && !github.event.inputs.version
run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease

# ############################################################

Expand Down Expand Up @@ -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"
- 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

# 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 }}")
if: github.event.inputs.channel != 'stable' && github.event.inputs.version
run: npm --workspaces version "${{ github.event.inputs.version }}"

- name: (Re-run) App version (alpha/beta, patch latest)
if: github.event.inputs.channel != 'stable' && !github.event.inputs.version
run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease
# ############################################################

- name: Git Commit
Expand Down
Loading