Skip to content

Commit 06a72d7

Browse files
authored
Remove step from dagster-cloud-action release where you merge the release tag change back into master (#224)
Summary: We haven't actually merged the release branch back into master in a while, and I can't think of a good reason to do so. This brings our release process in line with the OSS release process for other repos where there's a dev tag in master and we push from release branches. Test Plan: Run release script, verify resulting code changes
1 parent 38662dd commit 06a72d7

File tree

13 files changed

+51
-91
lines changed

13 files changed

+51
-91
lines changed

CONTRIBUTING.md

Lines changed: 11 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If you have a PAT handy you can just do:
1212
% echo $YOUR_GITHUB_PAT | docker login ghcr.io -u $YOUR_GITHUB_USERNAME --password-stdin
1313
```
1414

15-
## Step 2. Determine the new point version and create a release branch,
15+
## Step 2. Determine the new point version and create a release branch.
1616

1717
```
1818
% git checkout main
@@ -22,24 +22,11 @@ pex-v0.1
2222
pex-v0.1.14
2323
prha
2424
v0.1
25-
v0.1.10
26-
v0.1.11
27-
v0.1.12
28-
v0.1.13
29-
v0.1.14
30-
v0.1.15
31-
v0.1.16
32-
v0.1.17
33-
v0.1.18
34-
v0.1.19
35-
v0.1.20
36-
v0.1.21
25+
v1.10.12
3726
```
3827

39-
The point version is the next unused `v0.1.*` version, eg `v0.1.22` above. Create a release branch
40-
4128
```
42-
% git checkout -b release-0.1.22
29+
% git checkout -b release-1.10.13
4330
```
4431

4532
## Step 3. Build and deploy a new docker-cloud-action image, a new dagster.cloud.pex and update code references to docker
@@ -48,8 +35,7 @@ A script does this work. **Note**: a virtual environment using Python3.11 is req
4835

4936
```bash
5037
# Note no 'v' prefix
51-
# This accepts `NEW_VERSION OLD_VERSION` so it can update code references from the old to the new version.
52-
python scripts/release.py create-rc 0.1.22 0.1.21
38+
python scripts/release.py create-rc 1.10.13
5339
```
5440

5541
This leaves uncommitted changes in the working directory.
@@ -64,17 +50,17 @@ git diff
6450
git add . && git commit -m "Rebuild"
6551

6652
# Tag: using '-a' lets us add an annotation message, typically we use the version "v0.1.22"
67-
git tag -a v0.1.22
53+
git tag -a v1.10.13
6854
```
6955

7056
# Step 5. Push and Test
7157

7258
```bash
7359
# push the release branch
74-
git push --set-upstream origin release-0.1.22
60+
git push --set-upstream origin release-1.10.13
7561
# push the tag
76-
git push origin v0.1.22
77-
# to test, change the reference in a github workflow yaml file `@v0.1 -> @v0.1.22` and `@pex-v0.1 -> @v0.1.22`
62+
git push origin v1.10.13
63+
# to test, change the reference in a github workflow yaml file `@v0.1 -> @v0.1.22` and `@pex-v0.1 -> @v1.10.13`
7864
# see also dagster-cloud-action-test
7965
```
8066

@@ -92,53 +78,17 @@ Hybrid:
9278
If you make any changes and rebuild the rc, you need to retag and push the release tag:
9379

9480
```bash
95-
python scripts/release.py create-rc 0.1.22 0.1.21
81+
python scripts/release.py create-rc 1.10.13
9682

9783
# the only autogenerated change should be to the pex file because changes to the yamls have already committed
9884

9985
# -f to force since the tag exists
100-
git tag -f -a v0.1.22
101-
git push -f origin v0.1.22
86+
git tag -f -a v1.10.13
87+
git push -f origin v1.10.13
10288

10389
# test again, fix and repeat
10490
```
10591

106-
# Step 6. Promote
107-
Most users point at a dot version tag for the GitHub Action, e.g. `@v0.1` and `@pex-v0.1`.
108-
If you are releasing a fix or non-breaking feature, you want to move this tag so existing users get access to your changes.
109-
110-
> Due an unfortunate bug, the ci-summary step in many user's workflow is pinned to v0.1.27, so we need v0.1.27 to follow v0.1 as well.
111-
> See https://github.com/dagster-io/dagster-cloud-hybrid-quickstart/commit/2149359dd1076f3bcd6f652dc00cb74ac9c81636
112-
113-
```bash
114-
# use '-f' to force move the tag, since these tags already exist
115-
git tag -f v0.1 v0.1.22
116-
git tag -f pex-v0.1 v0.1.22
117-
git tag -f v0.1.27 v0.1
118-
119-
# needs a force push to move remote tags
120-
git push -f origin v0.1
121-
git push -f origin pex-v0.1
122-
git push -f origin v0.1.27
123-
```
124-
125-
Note: both `v0.1` and `pex-v0.1` tags should be kept in sync.
126-
127-
# Step 7. Merge the release branch into main
128-
129-
Create a PR, get approval, merge.
130-
131-
# Step 8. (optional) Revert
132-
133-
To revert, just tag the previous point version with the live tag and re push
134-
135-
```bash
136-
git tag -f v0.1 v0.1.21
137-
git tag -f pex-v0.1 v0.1.21
138-
git push -f origin v0.1
139-
git push -f origin pex-v0.1
140-
```
141-
14292
# Development and testing
14393

14494
## Testing the dagster-cloud.pex against a Dagster development branch

actions/utils/copy_template/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ inputs:
1212
description: "A string of the base image name for the deployed code location image."
1313
runs:
1414
using: "docker"
15-
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.43"
15+
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:dev"
1616
entrypoint: "/copy_template.sh"

actions/utils/deploy/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ outputs:
3939
description: "The Cloud deployment associated with this branch."
4040
runs:
4141
using: "docker"
42-
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.43"
42+
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:dev"
4343
entrypoint: "/deploy.sh"
4444
args:
4545
- ${{ inputs.pr }}

actions/utils/get_branch_deployment/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ outputs:
1515
description: "The Cloud deployment associated with this branch."
1616
runs:
1717
using: "docker"
18-
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.43"
18+
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:dev"
1919
entrypoint: "/get_branch_deployment.sh"

actions/utils/notify/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ inputs:
3030

3131
runs:
3232
using: "docker"
33-
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.43"
33+
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:dev"
3434
entrypoint: "/notify.sh"
3535
args:
3636
- ${{ inputs.pr }}

actions/utils/registry_info/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ inputs:
1212
description: "Alternative to providing organization ID. The URL of your Dagster Cloud organization."
1313
runs:
1414
using: "docker"
15-
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.43"
15+
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:dev"
1616
entrypoint: "/registry_info.sh"

actions/utils/run/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ outputs:
3535
description: "The ID of the launched run."
3636
runs:
3737
using: "docker"
38-
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.43"
38+
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:dev"
3939
entrypoint: "/run.sh"
4040
args:
4141
- ${{ inputs.pr }}

generated/gha/dagster-cloud.pex

-9.4 MB
Binary file not shown.

gitlab/dbt/serverless-ci-dbt.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ deploy-branch:
1212
stage: deploy
1313
rules:
1414
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
15-
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.43
15+
image: ghcr.io/dagster-io/dagster-cloud-action:dev
1616
script:
1717
# first create the branch deployment
1818
- export PR_TIMESTAMP=$(git log -1 --format='%cd' --date=unix)
@@ -51,7 +51,7 @@ deploy-branch:
5151

5252
close_branch:
5353
stage: deploy
54-
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.43
54+
image: ghcr.io/dagster-io/dagster-cloud-action:dev
5555
when: manual
5656
only:
5757
- merge_requests
@@ -76,7 +76,7 @@ deploy:
7676
stage: deploy
7777
rules:
7878
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
79-
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.43
79+
image: ghcr.io/dagster-io/dagster-cloud-action:dev
8080
script:
8181
# install dbt package
8282
- pip install pip --upgrade

gitlab/hybrid-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See https://docs.dagster.io/dagster-cloud/getting-started
1+
# See https://docs.dagster.io/dagster-cloud/getting-started
22
variables:
33
# The organization name in Dagster Cloud
44
DAGSTER_CLOUD_ORGANIZATION: <organinization-name>
@@ -29,11 +29,11 @@ workflow:
2929

3030
initialize:
3131
stage: setup
32-
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.43
32+
image: ghcr.io/dagster-io/dagster-cloud-action:dev
3333
script:
3434
- export
3535
- dagster-cloud ci check --project-dir=$DAGSTER_PROJECT_DIR --dagster-cloud-yaml-path=$DAGSTER_CLOUD_YAML_PATH
36-
- >
36+
- >
3737
dagster-cloud ci init --deployment=prod --statedir=$DAGSTER_BUILD_STATEDIR
3838
--project-dir=$DAGSTER_PROJECT_DIR --dagster-cloud-yaml-path=$DAGSTER_CLOUD_YAML_PATH
3939
--git-url=$CI_PROJECT_URL/-/commit/$CI_COMMIT_SHA
@@ -75,7 +75,7 @@ deploy-docker:
7575
dependencies:
7676
- build-image
7777
- initialize
78-
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.43
78+
image: ghcr.io/dagster-io/dagster-cloud-action:dev
7979
script:
8080
- dagster-cloud ci set-build-output --image-tag=$IMAGE_TAG
8181
- dagster-cloud ci deploy
@@ -87,7 +87,7 @@ deploy-docker-branch:
8787
dependencies:
8888
- build-image
8989
- initialize
90-
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.43
90+
image: ghcr.io/dagster-io/dagster-cloud-action:dev
9191
script:
9292
- dagster-cloud ci set-build-output --image-tag=$IMAGE_TAG
9393
- dagster-cloud ci deploy
@@ -97,7 +97,7 @@ deploy-docker-branch:
9797

9898
close-branch:
9999
stage: deploy
100-
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.43
100+
image: ghcr.io/dagster-io/dagster-cloud-action:dev
101101
when: manual
102102
only:
103103
- merge_requests

0 commit comments

Comments
 (0)