Skip to content

Commit bb55ab8

Browse files
authored
Merge branch 'main' into bump-pages-gem
2 parents ea51107 + de8d980 commit bb55ab8

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

README.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,17 @@ In order to release a new version of this Action:
7474

7575
1. Locate the semantic version of the [upcoming release][release-list] (a draft is maintained by the [`draft-release` workflow][draft-release]).
7676

77-
2. Prepare a pull request to update [`action.yml`][action.yml] to reference the incoming version
77+
2. Prepare a pull request to update [`action.yml`][action.yml] to reference the incoming version, get it approved, and merge it into the `main` branch.
7878

79-
3. Publish the draft release from the `main` branch with semantic version as the tag name, _with_ the checkbox to publish to the GitHub Marketplace checked. :ballot_box_with_check:
79+
3. Publish the draft release **as a pre-release** from the `main` branch with semantic version as the tag name, _with_:
80+
- the checkbox to publish to the GitHub Marketplace checked :ballot_box_with_check:
81+
- :warning: _AND_ the checkbox to **Set as a pre-release** checked. :ballot_box_with_check:
8082

81-
4. After publishing the release, the [`release` workflow][release] will automatically run to create/update the corresponding the major version tag such as `v1`.
83+
4. This will kick off a [Docker publishing workflow][docker-publish] for the newly created tag. Check the [associated workflow run list][docker-publish-workflow-runs] to verify the new Docker image is created successfully before moving on to the next step.
84+
85+
5. After the Docker image has been created with the new tag, find that [same pre-release][release-list] and edit it. Update it with the checkbox to **Set as the latest release** checked :ballot_box_with_check: and then publish it again.
86+
87+
6. After publishing it as the latest release, the [`release` workflow][release] will automatically run to create/update the corresponding the major version tag such as `v1`.
8288

8389
⚠️ Environment approval is required. Check the [Release workflow run list][release-workflow-runs].
8490

@@ -88,7 +94,9 @@ The scripts and documentation in this project are released under the [MIT Licens
8894

8995
<!-- references -->
9096
[release-list]: https://github.com/actions/jekyll-build-pages/releases
91-
[draft-release]: .github/workflows/release.yml
97+
[draft-release]: .github/workflows/draft-release.yml
98+
[docker-publish]: .github/workflows/docker-publish.yml
9299
[release]: .github/workflows/release.yml
93-
[release-workflow-runs]: https://github.com/actions/deploy-pages/actions/workflows/release.yml
100+
[docker-publish-workflow-runs]: https://github.com/actions/jekyll-build-pages/actions/workflows/docker-publish.yml
101+
[release-workflow-runs]: https://github.com/actions/jekyll-build-pages/actions/workflows/release.yml
94102
[action.yml]: https://github.com/actions/jekyll-build-pages/blob/649f5d3c2b2462620c8945f034200e431ceddd29/action.yml#LL31C54-L31C60

test_projects/mojombo/Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,20 @@ GEM
103103
rb-fsevent (>= 0.9.3)
104104
rb-inotify (>= 0.9.7)
105105
mercenary (0.3.6)
106-
mini_portile2 (2.8.2)
106+
mini_portile2 (2.8.5)
107107
minima (2.0.0)
108108
minitest (5.9.1)
109109
multipart-post (2.0.0)
110110
net-dns (0.8.0)
111-
nokogiri (1.15.2)
111+
nokogiri (1.16.2)
112112
mini_portile2 (~> 2.8.2)
113113
racc (~> 1.4)
114114
octokit (4.6.0)
115115
sawyer (~> 0.8.0, >= 0.5.3)
116116
pathutil (0.14.0)
117117
forwardable-extended (~> 2.6)
118118
public_suffix (1.5.3)
119-
racc (1.7.1)
119+
racc (1.7.3)
120120
rb-fsevent (0.9.8)
121121
rb-inotify (0.9.7)
122122
ffi (>= 0.5.0)

0 commit comments

Comments
 (0)