From 4c273f82fa6af922f4b31c7c8414d602d2b0bd7d Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Fri, 26 Apr 2024 13:11:57 +0100 Subject: [PATCH 1/5] chore: update internal tooling to v0.11.2 Signed-off-by: Justin Chadwell --- ci/go.sum | 29 +++++++++++++++++++---------- go.mod | 2 +- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ci/go.sum b/ci/go.sum index 482a4f37cef..4a9a3208c17 100644 --- a/ci/go.sum +++ b/ci/go.sum @@ -1,15 +1,19 @@ +dagger.io/dagger v0.11.2 h1:HoDAk1GZ676ziC/aNB4JX5tJbXhJ63ydBEo/oDacxJo= +dagger.io/dagger v0.11.2/go.mod h1:ABrEbaXuGQtqOlc0WlHWHQt/azY0jEs/O/X8xkX8xxM= github.com/99designs/gqlgen v0.17.44 h1:OS2wLk/67Y+vXM75XHbwRnNYJcbuJd4OBL76RX3NQQA= github.com/99designs/gqlgen v0.17.44/go.mod h1:UTCu3xpK2mLI5qcMNw+HKDiEL77it/1XtAjisC4sLwM= github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= github.com/Khan/genqlient v0.7.0/go.mod h1:HNyy3wZvuYwmW3Y7mkoQLZsa/R5n5yIRajS1kPBvSFM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= +github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= +github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/containerd/containerd v1.7.15 h1:afEHXdil9iAm03BmhjzKyXnnEBtjaLJefdU7DV0IFes= -github.com/containerd/containerd v1.7.15/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY= +github.com/containerd/containerd v1.7.15-0.20240329193453-0dcf21c1528a h1:3wNyZhyTrdOdR/DPQtPKXtRM/DmVc4jZ+5UmULm2ulE= +github.com/containerd/containerd v1.7.15-0.20240329193453-0dcf21c1528a/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -20,6 +24,8 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -28,8 +34,10 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= -github.com/moby/buildkit v0.13.0-rc3.0.20240501212635-51d85d712fad h1:acX5lJRvUENtB/ac78Iyg59ffbfZlsVxj6LvyOwLdLI= -github.com/moby/buildkit v0.13.0-rc3.0.20240501212635-51d85d712fad/go.mod h1:wH5RTVyFjMQ67euC1e3UUSw7yQe7JkAHmf8OZkQY7Y4= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/moby/buildkit v0.13.0-rc3.0.20240403135707-dc23e43dc15c h1:79uQuWhJQjc9Xl1ZwogIkS/BoKNF6GWps5sKTSOXXrs= +github.com/moby/buildkit v0.13.0-rc3.0.20240403135707-dc23e43dc15c/go.mod h1:k97+3l2jpDDC8JxSHywmN1lNFGgEYXk7WaK6LFrg9p0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -76,19 +84,20 @@ golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0= -google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= -google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go.mod b/go.mod index 310eae550de..f35a8e4c65f 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 replace dagger.io/dagger => ./sdk/go require ( - dagger.io/dagger v0.11.1 + dagger.io/dagger v0.11.2 github.com/99designs/gqlgen v0.17.44 github.com/Khan/genqlient v0.7.0 github.com/MakeNowJust/heredoc/v2 v2.0.1 From 566cc28a5393e5b89c3923c0ce2768b14ca47ba2 Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Fri, 26 Apr 2024 13:12:13 +0100 Subject: [PATCH 2/5] docs: update docs to refer to newest v0.11.2 release Signed-off-by: Justin Chadwell --- .../guides/snippets/github-google-cloud/main.yml | 2 +- docs/current_docs/partials/_install-cli.mdx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/current_docs/guides/snippets/github-google-cloud/main.yml b/docs/current_docs/guides/snippets/github-google-cloud/main.yml index 2b36bae8587..88fe2d8d2b5 100644 --- a/docs/current_docs/guides/snippets/github-google-cloud/main.yml +++ b/docs/current_docs/guides/snippets/github-google-cloud/main.yml @@ -16,7 +16,7 @@ jobs: name: Call Dagger Function uses: dagger/dagger-for-github@v5 with: - version: "0.11.1" + version: "0.11.2" verb: call args: | deploy \ diff --git a/docs/current_docs/partials/_install-cli.mdx b/docs/current_docs/partials/_install-cli.mdx index a582977ad7e..0117a9aeb02 100644 --- a/docs/current_docs/partials/_install-cli.mdx +++ b/docs/current_docs/partials/_install-cli.mdx @@ -30,17 +30,17 @@ If you do not have Homebrew installed, or you want to install a specific version ```shell cd /usr/local -curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.1 sh +curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.2 sh ./bin/dagger version -dagger 0.11.1 (GIT_SHA) darwin/arm64 +dagger 0.11.2 (GIT_SHA) darwin/arm64 ``` If your user account doesn't have sufficient privileges to install in `/usr/local` and `sudo` is available, use the following command instead: ```shell cd /usr/local -curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.1 sudo sh +curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.2 sudo sh ``` @@ -63,10 +63,10 @@ dagger is $HOME/.local/bin/dagger If you want to install a specific version of `dagger`, you can run: ```shell -curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.1 sh +curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.2 sh ./bin/dagger version -dagger 0.11.1 (GIT_SHA) linux/amd64 +dagger 0.11.2 (GIT_SHA) linux/amd64 ``` @@ -93,7 +93,7 @@ If you want to install a specific version of `dagger`, pass in a version number ```Powershell $script = Invoke-WebRequest -UseBasicParsing -Uri https://dl.dagger.io/dagger/install.ps1 -$params = "-DaggerVersion 0.11.1" +$params = "-DaggerVersion 0.11.2" "$script $params" | Invoke-Expression ``` From 66e13c622dabae79d93b41145a8a85e1b264d971 Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Fri, 26 Apr 2024 13:12:31 +0100 Subject: [PATCH 3/5] ci: update to install dagger cli v0.11.2 Signed-off-by: Justin Chadwell --- .github/workflows/_hack_make.yml | 2 +- .github/workflows/_new_release_notification.yml | 2 +- .github/workflows/helm.yml | 4 ++-- .github/workflows/publish-helm-chart.yml | 2 +- .github/workflows/publish.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_hack_make.yml b/.github/workflows/_hack_make.yml index 0791f932c99..e80577a6149 100644 --- a/.github/workflows/_hack_make.yml +++ b/.github/workflows/_hack_make.yml @@ -25,7 +25,7 @@ on: required: false dagger-version: type: string - default: "0.11.0" + default: "0.11.2" required: false jobs: diff --git a/.github/workflows/_new_release_notification.yml b/.github/workflows/_new_release_notification.yml index ed0537c56c8..93d97ade573 100644 --- a/.github/workflows/_new_release_notification.yml +++ b/.github/workflows/_new_release_notification.yml @@ -16,6 +16,6 @@ jobs: DISCORD_WEBHOOK: ${{ secrets.NEW_RELEASE_DISCORD_WEBHOOK }} uses: dagger/dagger-for-github@v5 with: - version: '0.11.1' + version: '0.11.2' module: 'github.com/gerhard/daggerverse/notify@2024-02-13' args: discord --webhook-url env:DISCORD_WEBHOOK --message '${{ inputs.message }}' diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index b0bcaa46ba8..34473bbf4ea 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -26,10 +26,10 @@ jobs: - name: Helm test uses: dagger/dagger-for-github@v5 with: - version: '0.11.1' + version: '0.11.2' args: --source=. helm test - name: Helm publish (dry-run) uses: dagger/dagger-for-github@v5 with: - version: '0.11.1' + version: '0.11.2' args: --source=. helm publish --dry-run=true --tag=main diff --git a/.github/workflows/publish-helm-chart.yml b/.github/workflows/publish-helm-chart.yml index 54d99097f27..bf06c676985 100644 --- a/.github/workflows/publish-helm-chart.yml +++ b/.github/workflows/publish-helm-chart.yml @@ -21,7 +21,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.RELEASE_DAGGER_CI_TOKEN }} DAGGER_CLOUD_TOKEN: ${{ secrets.DAGGER_CLOUD_TOKEN }} with: - version: '0.11.1' + version: '0.11.2' args: --source=. helm publish --tag=${{ github.ref_name }} --github-token=env:GITHUB_TOKEN diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1f30dacf7f6..d03e8a595f9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,7 +29,7 @@ jobs: cache-dependency-path: "ci/go.sum" - name: Install dagger run: | - curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.0 BIN_DIR=/usr/local/bin/ sudo -E sh + curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.11.2 BIN_DIR=/usr/local/bin/ sudo -E sh - name: "Publish Engine & CLI" run: | if [ $GITHUB_REF_NAME == 'main' ]; then From 78f8a3aaa55918463c01ea3f3cab96ed5a82892f Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Fri, 26 Apr 2024 13:45:09 +0100 Subject: [PATCH 4/5] chore: update RELEASING guide Signed-off-by: Justin Chadwell --- RELEASING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index d3740d0fa3c..5dfd4e7dab6 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,4 +1,4 @@ -# Releasing ![shields.io](https://img.shields.io/badge/Last%20updated%20on-April%2016,%202024-success?style=flat-square) +# Releasing ![shields.io](https://img.shields.io/badge/Last%20updated%20on-April%2025,%202024-success?style=flat-square) This describes how to release Dagger: @@ -144,7 +144,7 @@ and improve it. We want small, constant improvements which compound. Therefore: > SDK. This will ensure that all the APIs in the SDK are also available in the > Engine it depends on. -- [ ] Create e.g. `.changes/v0.10.2.md` by either running `changie batch patch` +- [ ] Create e.g. `.changes/v0.11.2.md` by either running `changie batch patch` (or `changie batch minor` if this is a new minor). > [!NOTE] @@ -152,9 +152,9 @@ and improve it. We want small, constant improvements which compound. Therefore: > If you do not have `changie` installed, see https://changie.dev - [ ] Make any necessary edits to the newly generated file, e.g. - `.changes/v0.11.1.md` + `.changes/v0.11.2.md` - [ ] Update `CHANGELOG.md` by running `changie merge`. -- [ ] `30 mins` Submit a PR - e.g. `add-v0.11.1-release-notes` with the new release notes +- [ ] `30 mins` Submit a PR - e.g. `add-v0.11.2-release-notes` with the new release notes so that they can be used in the new release. Get the PR reviewed & merged. The merge commit is what gets tagged in the next step. - [ ] Ensure that all checks are green βœ… for the `` on the @@ -282,8 +282,8 @@ git checkout -b improve-releasing-during-${ENGINE_VERSION:?must be set} # Commit & push # Test using the just-released CLI -# curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin DAGGER_VERSION=0.11.1 sh -# mv ~/.local/bin/dagger{,-0.11.1} +# curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin DAGGER_VERSION=0.11.2 sh +# mv ~/.local/bin/dagger{,-0.11.2} dagger version | grep ${ENGINE_VERSION:?must be set} dagger run ./hack/make engine:test ``` From 20d0378709d5b41350a55e05e6d7d07ef1bfe3d4 Mon Sep 17 00:00:00 2001 From: Gerhard Lazu Date: Fri, 3 May 2024 19:56:12 +0100 Subject: [PATCH 5/5] chore: Add Helm releasing instructions to RELEASING.md Also prepare the Helm chart for release right after this gets merged. Also run `go mod tidy` after rebasing. Signed-off-by: Gerhard Lazu --- .github/workflows/publish-helm-chart.yml | 2 +- RELEASING.md | 30 ++++++++++++++++++++---- ci/go.sum | 29 ++++++++--------------- helm/dagger/Chart.yaml | 4 ++-- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.github/workflows/publish-helm-chart.yml b/.github/workflows/publish-helm-chart.yml index bf06c676985..db7370dd42b 100644 --- a/.github/workflows/publish-helm-chart.yml +++ b/.github/workflows/publish-helm-chart.yml @@ -30,4 +30,4 @@ jobs: uses: ./.github/workflows/_new_release_notification.yml secrets: inherit with: - message: "🎑 Helm Chart: https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }}" + message: "☸️ Helm Chart: https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }}" diff --git a/RELEASING.md b/RELEASING.md index 5dfd4e7dab6..957241c8ab1 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -8,6 +8,7 @@ This describes how to release Dagger: - [β¬’ TypeScript SDK ⏱ `5mins`](#-typescript-sdk--5mins) - [πŸ§ͺ Elixir SDK ⏱ `5mins`](#-elixir-sdk--5mins) - [🐘 PHP SDK ⏱ `5mins`](#-php-sdk--5mins) +- [☸️ Helm chart ⏱ `2mins`](#%EF%B8%8F-helm-chart--2mins) - [πŸ“’ Documentation ⏱ `5mins`](#-documentation--5mins) - [πŸ› Playground ⏱ `2mins`](#-playground--2mins) - [🌌 Daggerverse ⏱ `2mins`](#-daggerverse--2mins) @@ -24,9 +25,8 @@ This is a high-level diagram of how all the pieces fit together: flowchart TB repo(["πŸ™ github.com/dagger/dagger"]) docs["πŸ“’ Documentation"] - playground["πŸ› Playground"] ci["βš™οΈ CI"] - repo -.-> docs & playground & ci + repo -.-> docs & ci subgraph Dagger engine("πŸš™ Engine") @@ -39,7 +39,7 @@ flowchart TB brew-tap["πŸ™ github.com/dagger/homebrew-tap"] github-action["πŸ™ github.com/dagger/dagger-for-github"] nix["❄️ github.com/dagger/nix"] - cli --> S3 --> brew-tap & github-action & nix + cli --> S3 ------> brew-tap & github-action & nix registry["πŸ“¦ registry.dagger.io/engine"] ghcr["πŸ™ ghcr.io/dagger/engine"] @@ -49,12 +49,15 @@ flowchart TB go-repo["πŸ™ github.com/dagger/dagger-go-sdk"] go-pkg["🐹 dagger.io/dagger"] go-ref["🐹 pkg.go.dev/dagger.io/dagger"] + playground["πŸ› Playground"] daggerverse["🌌 Daggerverse"] cloud["☁️ Dagger Cloud"] repo ==> go --> go-repo --> go-pkg & go-ref go-pkg -.-> daggerverse & cloud - registry -.- S3 -.- go & python & typescript & elixir + registry -.- S3 -.- go & python & typescript & elixir & php & helm + + registry -.....- playground python["🐍 Python SDK"] pypi["🐍 pypi.org/project/dagger-io"] @@ -73,6 +76,9 @@ flowchart TB php-repo["πŸ™ github.com/dagger/dagger-php-sdk"] php-pkg["🐘 packagist.org/packages/dagger/dagger"] repo ======> php --> php-repo --> php-pkg + + helm["☸️ Helm chart"] + repo ======> helm ``` ## Let the team know @@ -224,6 +230,7 @@ changie merge cd ../.. ``` +- [ ] For the Helm chart, bump `version` & `appVersion` in `helm/dagger/Chart.yaml` - [ ] Commit and push the changes with the message `Add SDK release notes` - [ ] `30mins` Open this draft PR in [github.com/dagger/dagger/pulls](https://github.com/dagger/dagger/pulls) & @@ -420,6 +427,21 @@ gh release create "sdk/php/${PHP_SDK_VERSION:?must be set}" \ - [ ] ⚠️ De-select **Set as the latest release** (only used for πŸš™ Engine + πŸš— CLI releases) - [ ] Click on **Publish release** +## ☸️ Helm chart ⏱ `2mins` + +- [ ] Tag & publish: + +```console +export HELM_CHART_VERSION="$(awk '/^version: / { print $2 }' helm/dagger/Chart.yaml)" +git tag "helm/chart/v${HELM_CHART_VERSION:?must be set}" "${SDK_GIT_SHA:?must be set}" +git push "${DAGGER_REPO_REMOTE:?must be set}" "helm/chart/v${HELM_CHART_VERSION:?must be set}" +``` + +This will trigger the [`publish-helm-chart` +workflow](https://github.com/dagger/dagger/actions/workflows/publish-helm-chart.yml) +which publishes to [πŸ™ +registry.dagger.io/dagger-helm](https://github.com/dagger/dagger/pkgs/container/dagger-helm). + ## πŸ“’ Documentation ⏱ `5mins` > [!WARNING] diff --git a/ci/go.sum b/ci/go.sum index 4a9a3208c17..482a4f37cef 100644 --- a/ci/go.sum +++ b/ci/go.sum @@ -1,19 +1,15 @@ -dagger.io/dagger v0.11.2 h1:HoDAk1GZ676ziC/aNB4JX5tJbXhJ63ydBEo/oDacxJo= -dagger.io/dagger v0.11.2/go.mod h1:ABrEbaXuGQtqOlc0WlHWHQt/azY0jEs/O/X8xkX8xxM= github.com/99designs/gqlgen v0.17.44 h1:OS2wLk/67Y+vXM75XHbwRnNYJcbuJd4OBL76RX3NQQA= github.com/99designs/gqlgen v0.17.44/go.mod h1:UTCu3xpK2mLI5qcMNw+HKDiEL77it/1XtAjisC4sLwM= github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= github.com/Khan/genqlient v0.7.0/go.mod h1:HNyy3wZvuYwmW3Y7mkoQLZsa/R5n5yIRajS1kPBvSFM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= -github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= -github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/containerd/containerd v1.7.15-0.20240329193453-0dcf21c1528a h1:3wNyZhyTrdOdR/DPQtPKXtRM/DmVc4jZ+5UmULm2ulE= -github.com/containerd/containerd v1.7.15-0.20240329193453-0dcf21c1528a/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY= +github.com/containerd/containerd v1.7.15 h1:afEHXdil9iAm03BmhjzKyXnnEBtjaLJefdU7DV0IFes= +github.com/containerd/containerd v1.7.15/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -24,8 +20,6 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -34,10 +28,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/moby/buildkit v0.13.0-rc3.0.20240403135707-dc23e43dc15c h1:79uQuWhJQjc9Xl1ZwogIkS/BoKNF6GWps5sKTSOXXrs= -github.com/moby/buildkit v0.13.0-rc3.0.20240403135707-dc23e43dc15c/go.mod h1:k97+3l2jpDDC8JxSHywmN1lNFGgEYXk7WaK6LFrg9p0= +github.com/moby/buildkit v0.13.0-rc3.0.20240501212635-51d85d712fad h1:acX5lJRvUENtB/ac78Iyg59ffbfZlsVxj6LvyOwLdLI= +github.com/moby/buildkit v0.13.0-rc3.0.20240501212635-51d85d712fad/go.mod h1:wH5RTVyFjMQ67euC1e3UUSw7yQe7JkAHmf8OZkQY7Y4= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -84,20 +76,19 @@ golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= -google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= -google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/helm/dagger/Chart.yaml b/helm/dagger/Chart.yaml index e1667bb8d6d..49dff9572d0 100644 --- a/helm/dagger/Chart.yaml +++ b/helm/dagger/Chart.yaml @@ -3,5 +3,5 @@ name: dagger-helm description: Dagger Helm chart type: application -version: 0.1.2 -appVersion: v0.11.1 +version: 0.1.3 +appVersion: v0.11.2