🔖 Release 1.8.7 #506

phatblat · 2023-11-25T21:14:00Z

Release branch for 1.8.7.

This branch includes the new release workflow #510.

script/bottle

phatblat · 2023-11-29T03:47:27Z

I've published a build from this branch on the releases page:
https://github.com/mas-cli/mas/releases/tag/v1.8.7-beta.1

rgoldberg · 2024-01-01T18:57:17Z

@phatblat

Not sure if you saw my comment:

#505 (comment)

I think testing & releasing #496 or #503 (the 1-line code change is exactly the same in both of them) should solve the main problem of iOS app versions showing up as Mac app versions, while 1.8.7 beta 1 didn't fix it for me (on macOS 12.7.x on an Intel).

Let me know if I can help get some or all of the fixes out.

Happy new year.

Thanks.

Adds sonoma and ventura

v1.8.7-beta.1

phatblat · 2024-11-03T19:32:18Z

The release run for v1.8.7-beta.51 was successful, skipping the homebrew-core job since this was a pre-release.

@rgoldberg I resolved the lint errors while waiting on release builds.

I'm going to kick off the real v1.8.7 release and see how this goes 🤞🏻

rgoldberg · 2024-11-03T19:47:38Z

@phatblat I don't see any PR (open or closed) for mas 1.8.7 in the Homebrew core repo.

I assume the formula updates are done via a PR.

I see the PR in the mas tap. For some reason, it's marked as a WIP. I assume it should be switched to be a normal PR.

toobuntu · 2024-11-03T19:51:53Z

perhaps the brew audit command isn't aware of the audit_exceptions/github_prerelease_allowlist.json file.

This file path was added here the mas repo, but it belongs in the local tap. Even there, it would apply only to the formula in that tap but not the official formula in homebrew-core. For that, you would have to add the exception to https://github.com/Homebrew/homebrew-core/blob/master/audit_exceptions/github_prerelease_allowlist.json.

Also, my understanding is that homebrew uses the brew bump command as a frontend for both brew bump-formula-pr and brew bump-cask-pr.

phatblat · 2024-11-03T20:03:18Z

@phatblat I don't see any PR (open or closed) for mas 1.8.7 in the Homebrew core repo.

I assume the formula updates are done via a PR.

The PR for the new version didn't work. I'll investigate and retry.

I see the PR in the mas tap. For some reason, it's marked as a WIP. I assume it should be switched to be a normal PR.

Yeah, it should but I forgot I left --draft in the gh pr create command. I'll fix that.

phatblat · 2024-11-03T20:21:26Z

The release failed again. Looks like the issue was with the --fork-org mas-cli option.

+ brew bump-formula-pr --tag=v1.8.7 --revision=4405807010987802c0967bbf349c08808062b824 --strict --verbose --online --no-browse --fork-org mas-cli mas
/opt/homebrew/Library/Taps/homebrew/homebrew-core ~/work/mas/mas
Updating homebrew/core formula with a PR
/opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.3.5/bin/bundle clean
==> replace /tag:(\s+")v1.8.6(?=")/ with "tag:\\1v1.8.7\\2"
==> replace "560c89af2c1fdf0da9982a085e19bb6f5f9ad2d0" with "4405807010987802c0967bbf349c08808062b824"
Error: Unable to fork: GitHub API Error: Must have admin rights to Repository.
HOMEBREW_GITHUB_API_TOKEN may be invalid or expired; check:
  https://github.com/settings/tokens
!
Error: Process completed with exit code 1.

toobuntu · 2024-11-03T20:31:17Z

In mas-cli/homebrew-tap#45 is the vv correct?

-    root_url "https://github.com/mas-cli/mas/releases/download/v1.8.7-beta.1"
+    root_url "https://github.com/mas-cli/mas/releases/download/vv1.8.7"

phatblat · 2024-11-03T20:41:02Z

In mas-cli/homebrew-tap#45 is the vv correct?

Nope. Thanks for calling this out, @toobuntu!

phatblat · 2024-11-03T20:42:16Z

Got a little bit further by adding repo the scopes on the PAT I created for the HOMEBREW_GITHUB_API_TOKEN secret.

 brew bump-formula-pr --tag=v1.8.7 --revision=4405807010987802c0967bbf349c08808062b824 --strict --verbose --online --no-browse --fork-org mas-cli mas
/opt/homebrew/Library/Taps/homebrew/homebrew-core ~/work/mas/mas
Updating homebrew/core formula with a PR

/opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.3.5/bin/bundle clean
==> replace /tag:(\s+")v1.8.6(?=")/ with "tag:\\1v1.8.7\\2"
==> replace "560c89af2c1fdf0da9982a085e19bb6f5f9ad2d0" with "4405807010987802c0967bbf349c08808062b824"
git add /opt/homebrew/Library/Taps/homebrew/homebrew-core/Formula/m/mas.rb
git checkout --no-track -b bump-mas-1.8.7 origin/master
Switched to a new branch 'bump-mas-1.8.7'
M	Formula/m/mas.rb
git commit --no-edit --verbose --message=mas 1.8.7 -- /opt/homebrew/Library/Taps/homebrew/homebrew-core/Formula/m/mas.rb
[bump-mas-1.8.7 2dfea1852ff] mas 1.8.7
 1 file changed, 2 insertions(+), 2 deletions(-)
remote: 
remote: Create a pull request for 'bump-mas-1.8.7' on GitHub by visiting:        
remote:      https://github.com/mas-cli/homebrew-core-1/pull/new/bump-mas-1.8.7        
remote: 
To https://github.com/mas-cli/homebrew-core-1.git
 * [new branch]              bump-mas-1.8.7 -> bump-mas-1.8.7
branch 'bump-mas-1.8.7' set up to track '***github.com/mas-cli/homebrew-core-1.git/bump-mas-1.8.7'.
git checkout --quiet -
Error: Unable to open pull request: Validation Failed: [{"resource"=>"PullRequest", "field"=>"head", "code"=>"invalid"}]!
Error: Process completed with exit code 1.

rgoldberg

I should investigate release.yml more, but I might not have time to do too much more with with now, so I figured I'd submit my review. I might change/add a few comments.

rgoldberg · 2024-11-03T21:49:07Z

script/brew_tap_update

Why not just call script/bottle instead of this script?

rgoldberg · 2024-11-03T22:29:57Z

script/version_bump

This script should probably be renamed generate_brew_formula or brew_formula.

By default, it should generate the core formula, but accept an optional --tap to generate the tap formula instead.

Generating the Package.swift should be a separate script (right now, that can be done via script/version --write, but maybe we should move that functionality to a new script/generate_package_swift or script/package_swift script to keep everything modular).

Instead of always modifying an existing formula on the file system (Homebrew/mas.rb or Homebrew/mas-tap.rb), it should generate one script at a time from scratch, printing the contents to stdout, with the caller redirecting that to a file.

When our release process calls this script, each output formula should be redirected to a file under a git-ignored directory (probably just make some directory under .build/).

This will allow us to remove Homebrew/mas.rb & Homebrew/mas-tap.rb from the repo, which will prevent accidental check ins of different versioned formulae in the repo or version mismatches between varios files, git tags, or released artifacts.

This script shouldn't accept a revision. The revision should be obtained from version tag. Otherwise, things can get out of sync.

It will also make everything more modular. You should be able to generate one output by itself instead of being locking into generating all 3. You should be able to just see the output instead of needing to write a file. You should be able to write output wherever you want, instead of being constrained by what's in the script.

Also, a general note: I've normally seen only seen environment variable name in upper case, with other variables in lower case.

rgoldberg · 2024-11-03T22:33:17Z

script/version_bump

+  exit 1
+fi
+
+LOCAL_MAS_FORMULA_PATH="Homebrew/mas.rb"


I'd rename LOCAL_MAS_FORMULA_PATH as LOCAL_CORE_FORMULA_PATH. Both this and LOCAL_TAP_FORMULA_PATH are for mas, the distinguishing difference is one is for core, the other for tap.

Suggested change

LOCAL_MAS_FORMULA_PATH="Homebrew/mas.rb"

LOCAL_CORE_FORMULA_PATH="Homebrew/mas.rb"

rgoldberg · 2024-11-03T22:47:38Z

script/version_bump

+  sd '( +tag: +)"[^"]+"' "\$1\"${MAS_VERSION}\"" "${file}"
+  sd '( +revision: +)"[^"]+"' "\$1\"${REVISION}\"" "${file}"
+  sd '( +root_url "https://github.com/mas-cli/mas/releases/download/).+' "\${1}${MAS_VERSION}\"" "${file}"


If we generate output from a script instead of modifying files on the file system (as per my comment on this file as a whole), we can get rid of the sd dependency.

rgoldberg · 2024-11-03T22:56:34Z

Homebrew/mas.rb

Remove this from git. Generate the formula as per my file comment on script/version_bump.

rgoldberg · 2024-11-06T04:25:33Z

.github/workflows/release.yml

+          script/bootstrap -f
+
+      - name: 🔧 Configure Git Author
+        if: env.PRE_RELEASE == 'false'


Suggested change

if: env.PRE_RELEASE == 'false'

rgoldberg · 2024-11-06T04:25:49Z

.github/workflows/release.yml

+          ref: ${{ needs.start.outputs.release_branch }}
+
+      - name: 👢 Bootstrap
+        if: env.PRE_RELEASE == 'false'


Suggested change

if: env.PRE_RELEASE == 'false'

rgoldberg · 2024-11-06T04:25:55Z

.github/workflows/release.yml

+      PRE_RELEASE: ${{ needs.start.outputs.pre_release }}
+    steps:
+      - uses: actions/checkout@v4
+        if: env.PRE_RELEASE == 'false'


Suggested change

if: env.PRE_RELEASE == 'false'

rgoldberg · 2024-11-06T04:30:15Z

.github/workflows/release.yml

+    env:
+      PRE_RELEASE: ${{ needs.start.outputs.pre_release }}


I assume this syntax will work.

Suggested change

env:

PRE_RELEASE: ${{ needs.start.outputs.pre_release }}

if: ${{ needs.start.outputs.pre_release }} == 'false'

I suspect it will.

rgoldberg · 2024-11-06T04:36:05Z

.github/workflows/release.yml

+      # Error: No available formula or cask with the name "mas-cli/tap/mas".
+      - name: 🚰 Checkout mas tap
+        run: |
+          rm -rf /opt/homebrew/Library/Taps


/opt/homebrew should be replaced everywhere by "$(brew --prefix)", just in case someone on Intel uses act to test actions locally, or in case brew uses some other prefix in the future.

Partial #506 Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>

rgoldberg · 2024-11-07T15:10:34Z

.github/workflows/release.yml

+
+      - id: dry_run
+        run: |
+          echo "DRY_RUN=false" >>"$GITHUB_OUTPUT"


Why is $GITHUB_OUTPUT used? the linked documentation above uses "${GITHUB_ENV}".

Suggested change

echo "DRY_RUN=false" >>"$GITHUB_OUTPUT"

echo "DRY_RUN=false" >>"${GITHUB_ENV}"

rgoldberg · 2024-11-07T15:11:38Z

.github/workflows/release.yml

+
+      - id: mas_version
+        run: |
+          echo "MAS_VERSION=${{ github.event.release.tag_name }}" >>"$GITHUB_OUTPUT"


See above.

Suggested change

echo "MAS_VERSION=${{ github.event.release.tag_name }}" >>"$GITHUB_OUTPUT"

echo "MAS_VERSION=${{ github.event.release.tag_name }}" >>"${GITHUB_ENV}"

rgoldberg · 2024-11-07T15:12:02Z

.github/workflows/release.yml

+
+      - id: pre_release
+        run: |
+          echo "PRE_RELEASE=$(grep -q '-' <<<$MAS_VERSION && echo 'true' || echo 'false')" >>"$GITHUB_OUTPUT"


See above.

Suggested change

echo "PRE_RELEASE=$(grep -q '-' <<<$MAS_VERSION && echo 'true' || echo 'false')" >>"$GITHUB_OUTPUT"

echo "PRE_RELEASE=$(grep -q '-' <<<$MAS_VERSION && echo 'true' || echo 'false')" >>"${GITHUB_ENV}"

rgoldberg · 2024-11-07T15:12:27Z

.github/workflows/release.yml

+
+      - id: release_branch
+        run: |
+          echo "RELEASE_BRANCH=releases/release-${{ github.event.release.tag_name }}" >>"$GITHUB_OUTPUT"


See above.

Suggested change

echo "RELEASE_BRANCH=releases/release-${{ github.event.release.tag_name }}" >>"$GITHUB_OUTPUT"

echo "RELEASE_BRANCH=releases/release-${{ github.event.release.tag_name }}" >>"${GITHUB_ENV}"

phatblat added 🧽 chore Administrative task: documentation, build, test, release, git, etc. 🍺 homebrew labels Nov 25, 2023

phatblat self-assigned this Nov 25, 2023

oschrenk reviewed Nov 25, 2023

View reviewed changes

script/bottle Outdated Show resolved Hide resolved

oschrenk reviewed Nov 25, 2023

View reviewed changes

script/bottle Outdated Show resolved Hide resolved

phatblat force-pushed the releases/release-1.8.7 branch from dbce000 to 6743fab Compare November 29, 2023 03:26

phatblat force-pushed the search branch from f9e9ce8 to 86b2559 Compare February 17, 2024 21:07

Base automatically changed from search to main February 18, 2024 07:02

phatblat force-pushed the releases/release-1.8.7 branch from 6743fab to b797ce7 Compare February 18, 2024 07:09

rgoldberg force-pushed the releases/release-1.8.7 branch from b797ce7 to 8318935 Compare February 18, 2024 13:47

chris-araman and others added 15 commits February 18, 2024 08:22

🔍 Search for compatible iPad and iPhone apps

436c3a2

🍺 Update mas homebrew formula (1.8.6)

ef28bc9

🍺 Update mas-tap homebrew formula (1.8.6)

f1276da

Adds sonoma and ventura

🔨 Add support for sonoma & ventura to bottle script

742e054

🔖 Version 1.8.7-alpha.1

f3e681a

v1.8.7-beta.1

👌🏻 Fix untested OS branches in bottle script

8076c66

🔥 Remove dup bottles target

b8dc5ff

🔨 Rename MAS_VERSION variable

40d3cfd

🥅 Swalloer error if trash fails

a12d232

🔨 Add sonoma & ventura to bottle script

2a02cee

🔥 Remove duplicate monterey bottle reference

bcd2411

🔨 Use brew --prefix

a143845

🔨 Install universal binary

96ff7ec

🔀 Fix merge mistake

f162f6a

🎨 Format bash scripts

666e505

phatblat force-pushed the releases/release-1.8.7 branch from 8318935 to 666e505 Compare February 18, 2024 16:42

phatblat added 2 commits February 18, 2024 09:59

🔧 Configure .actrc

cf2d8d6

🚚 Rename pr-checks workflow

e20b14a

phatblat added 3 commits November 3, 2024 12:11

🚨 Remove unused vars

58f9fbc

🔧 Add PRE_RELEASE var to release workflow

2ccdb03

👔 Only run homebrew-core job for real releases

d1be1d9

phatblat added 2 commits November 3, 2024 13:04

👔 Open tap PR as ready to review instead of draft

a976581

🩹 Add pre_release output to start step

4405807

🩹 Remove duplicate v in tap's root_url

c314af5

mas-cli deleted a comment from houndci-bot Nov 3, 2024

MikeMcQuaid mentioned this pull request Nov 4, 2024

Release new version #512

Closed

rgoldberg requested changes Nov 6, 2024

View reviewed changes

Fix typo in argument check in script/build.

8617c75

Partial #506 Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>

rgoldberg reviewed Nov 7, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🔖 Release 1.8.7 #506

🔖 Release 1.8.7 #506

phatblat commented Nov 25, 2023 •

edited

Loading

phatblat commented Nov 29, 2023

rgoldberg commented Jan 1, 2024 •

edited

Loading

phatblat commented Nov 3, 2024

rgoldberg commented Nov 3, 2024

toobuntu commented Nov 3, 2024 •

edited

Loading

phatblat commented Nov 3, 2024

phatblat commented Nov 3, 2024

toobuntu commented Nov 3, 2024

phatblat commented Nov 3, 2024

phatblat commented Nov 3, 2024 •

edited

Loading

rgoldberg left a comment

rgoldberg Nov 3, 2024

rgoldberg Nov 3, 2024

rgoldberg Nov 3, 2024

rgoldberg Nov 3, 2024

rgoldberg Nov 3, 2024

rgoldberg Nov 6, 2024

rgoldberg Nov 6, 2024

rgoldberg Nov 6, 2024

rgoldberg Nov 6, 2024

phatblat Nov 6, 2024

rgoldberg Nov 6, 2024

rgoldberg Nov 7, 2024

rgoldberg Nov 7, 2024

rgoldberg Nov 7, 2024

rgoldberg Nov 7, 2024

	LOCAL_MAS_FORMULA_PATH="Homebrew/mas.rb"
	LOCAL_CORE_FORMULA_PATH="Homebrew/mas.rb"

	env:
	PRE_RELEASE: ${{ needs.start.outputs.pre_release }}
	if: ${{ needs.start.outputs.pre_release }} == 'false'

	echo "DRY_RUN=false" >>"$GITHUB_OUTPUT"
	echo "DRY_RUN=false" >>"${GITHUB_ENV}"

	echo "MAS_VERSION=${{ github.event.release.tag_name }}" >>"$GITHUB_OUTPUT"
	echo "MAS_VERSION=${{ github.event.release.tag_name }}" >>"${GITHUB_ENV}"

	echo "PRE_RELEASE=$(grep -q '-' <<<$MAS_VERSION && echo 'true' \|\| echo 'false')" >>"$GITHUB_OUTPUT"
	echo "PRE_RELEASE=$(grep -q '-' <<<$MAS_VERSION && echo 'true' \|\| echo 'false')" >>"${GITHUB_ENV}"

	echo "RELEASE_BRANCH=releases/release-${{ github.event.release.tag_name }}" >>"$GITHUB_OUTPUT"
	echo "RELEASE_BRANCH=releases/release-${{ github.event.release.tag_name }}" >>"${GITHUB_ENV}"

🔖 Release 1.8.7 #506

Are you sure you want to change the base?

🔖 Release 1.8.7 #506

Conversation

phatblat commented Nov 25, 2023 • edited Loading

phatblat commented Nov 29, 2023

rgoldberg commented Jan 1, 2024 • edited Loading

phatblat commented Nov 3, 2024

rgoldberg commented Nov 3, 2024

toobuntu commented Nov 3, 2024 • edited Loading

phatblat commented Nov 3, 2024

phatblat commented Nov 3, 2024

toobuntu commented Nov 3, 2024

phatblat commented Nov 3, 2024

phatblat commented Nov 3, 2024 • edited Loading

rgoldberg left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

phatblat commented Nov 25, 2023 •

edited

Loading

rgoldberg commented Jan 1, 2024 •

edited

Loading

toobuntu commented Nov 3, 2024 •

edited

Loading

phatblat commented Nov 3, 2024 •

edited

Loading