Skip to content

Commit 89d67c4

Browse files
committed
Switch from the subset branch back to main
When I created these branches ~a year ago, I had lofty goals that we'd be able to turn on "everything" quickly enough that the `subset` branch would be short-lived and that `main` could stay faithfully tracking the "everything is included" world, but the reality is much messier. In an attempt to be extremely pragmatic about the reality, my intention is to delete the existing (now extremely outdated) `main` branch and simply rename `subset` to `main`. It will then organically grow to include "everything" as we've been doing (and eventually we'll even ditch `subset.txt` 🤞).
1 parent c6812d5 commit 89d67c4

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.test/provenance/out.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"buildType": "https://actions.github.io/buildtypes/workflow/v1",
7676
"externalParameters": {
7777
"workflow": {
78-
"ref": "refs/heads/subset",
78+
"ref": "refs/heads/main",
7979
"repository": "https://github.com/docker-library/meta",
8080
"path": ".github/workflows/build.yml",
8181
"digest": {
@@ -98,7 +98,7 @@
9898
},
9999
"resolvedDependencies": [
100100
{
101-
"uri": "git+https://github.com/docker-library/meta@refs/heads/subset",
101+
"uri": "git+https://github.com/docker-library/meta@refs/heads/main",
102102
"digest": {
103103
"gitCommit": "0123456789abcdef0123456789abcdef01234567"
104104
}
@@ -107,7 +107,7 @@
107107
},
108108
"runDetails": {
109109
"builder": {
110-
"id": "https://github.com/docker-library/meta/.github/workflows/build.yml@refs/heads/subset"
110+
"id": "https://github.com/docker-library/meta/.github/workflows/build.yml@refs/heads/main"
111111
},
112112
"metadata": {
113113
"invocationId": "https://github.com/docker-library/meta/actions/runs/9001/attempts/2"
@@ -227,7 +227,7 @@
227227
"buildType": "https://actions.github.io/buildtypes/workflow/v1",
228228
"externalParameters": {
229229
"workflow": {
230-
"ref": "refs/heads/subset",
230+
"ref": "refs/heads/main",
231231
"repository": "https://github.com/docker-library/meta",
232232
"path": ".github/workflows/build.yml",
233233
"digest": {
@@ -251,7 +251,7 @@
251251
},
252252
"resolvedDependencies": [
253253
{
254-
"uri": "git+https://github.com/docker-library/meta@refs/heads/subset",
254+
"uri": "git+https://github.com/docker-library/meta@refs/heads/main",
255255
"digest": {
256256
"gitCommit": "0123456789abcdef0123456789abcdef01234567"
257257
}
@@ -260,7 +260,7 @@
260260
},
261261
"runDetails": {
262262
"builder": {
263-
"id": "https://github.com/docker-library/meta/.github/workflows/build.yml@refs/heads/subset"
263+
"id": "https://github.com/docker-library/meta/.github/workflows/build.yml@refs/heads/main"
264264
},
265265
"metadata": {
266266
"invocationId": "https://github.com/docker-library/meta/actions/runs/9001/attempts/2"

Jenkinsfile.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ node('multiarch-' + env.BASHBREW_ARCH) { ansiColor('xterm') {
1818
url: 'https://github.com/docker-library/meta.git',
1919
name: 'origin',
2020
]],
21-
branches: [[name: '*/subset']], // TODO back to main
21+
branches: [[name: '*/main']],
2222
extensions: [
2323
submodule(
2424
parentCredentials: true,

Jenkinsfile.deploy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ node('put-shared') { ansiColor('xterm') {
2323
url: 'https://github.com/docker-library/meta.git',
2424
name: 'origin',
2525
]],
26-
branches: [[name: '*/subset']], // TODO back to main
26+
branches: [[name: '*/main']],
2727
extensions: [
2828
submodule(
2929
parentCredentials: true,

Jenkinsfile.meta

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ node {
1515
credentialsId: 'docker-library-bot',
1616
name: 'origin',
1717
]],
18-
branches: [[name: '*/subset']], // TODO back to main
18+
branches: [[name: '*/main']],
1919
extensions: [
2020
submodule(
2121
recursiveSubmodules: true,
@@ -101,7 +101,7 @@ node {
101101
}
102102
sshagent(['docker-library-bot']) {
103103
stage('Push') {
104-
sh 'git push origin HEAD:subset' // TODO back to main
104+
sh 'git push origin HEAD:main'
105105
}
106106
}
107107
}

Jenkinsfile.trigger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ node {
2424
url: 'https://github.com/docker-library/meta.git',
2525
name: 'origin',
2626
]],
27-
branches: [[name: '*/subset']], // TODO back to main
27+
branches: [[name: '*/main']],
2828
extensions: [
2929
submodule(
3030
parentCredentials: true,

jenkins.jq

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def crane_deploy_commands:
2121
# output: json object (to trigger the build on GitHub Actions)
2222
def gha_payload:
2323
{
24-
ref: "subset", # TODO back to main
24+
ref: "main",
2525
inputs: (
2626
{
2727
buildId: .buildId,

0 commit comments

Comments
 (0)