Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tool(mutagen): update version to 0.18.0 #6655

Merged
merged 3 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions core/src/mutagen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ export function parseSyncListResult(res: ExecaReturnValue): SyncSession[] {
return parsed
}

export const mutagenVersion = "0.17.6"
export const mutagenVersion = "0.18.0"

export const mutagenCliSpec: PluginToolSpec = {
name: "mutagen",
Expand All @@ -941,7 +941,7 @@ export const mutagenCliSpec: PluginToolSpec = {
platform: "darwin",
architecture: "amd64",
url: `https://github.com/mutagen-io/mutagen/releases/download/v${mutagenVersion}/mutagen_darwin_amd64_v${mutagenVersion}.tar.gz`,
sha256: "f082eef2ae405a6bf5effdbcd000bb5fe2bc7b0968f86b2b54d9d3260c48c739",
sha256: "2df8723bce8e7721e6aef576b0025f12205acbe699bdb90d84dbd53e658f57be",
extract: {
format: "tar",
targetPath: "mutagen",
Expand All @@ -951,7 +951,7 @@ export const mutagenCliSpec: PluginToolSpec = {
platform: "darwin",
architecture: "arm64",
url: `https://github.com/mutagen-io/mutagen/releases/download/v${mutagenVersion}/mutagen_darwin_arm64_v${mutagenVersion}.tar.gz`,
sha256: "b6c35942ca9cbbbf726bfa249da554d829a8a28cad620a55e02d098d692121d1",
sha256: "0f0959f12b1a767bffa5ee40c6a255b77758d049c36ed0d6a1ad6830ac7f78a3",
extract: {
format: "tar",
targetPath: "mutagen",
Expand All @@ -961,7 +961,7 @@ export const mutagenCliSpec: PluginToolSpec = {
platform: "linux",
architecture: "amd64",
url: `https://github.com/mutagen-io/mutagen/releases/download/v${mutagenVersion}/mutagen_linux_amd64_v${mutagenVersion}.tar.gz`,
sha256: "1b826e121be59506e133d90dc2b8a0c820b92f480d9b2b230d8b389d6178a6cf",
sha256: "c82bde0ecd3810650087a8fd99e8baf4a3119b85a9cb14155a0d9209600374d4",
extract: {
format: "tar",
targetPath: "mutagen",
Expand All @@ -971,7 +971,7 @@ export const mutagenCliSpec: PluginToolSpec = {
platform: "linux",
architecture: "arm64",
url: `https://github.com/mutagen-io/mutagen/releases/download/v${mutagenVersion}/mutagen_linux_arm64_v${mutagenVersion}.tar.gz`,
sha256: "2a383cb572a1bdad83f7c4be3cc4a541a58e6c9e11e326ee4cc2d0e14f9d003a",
sha256: "c1621eede2cd9d36cd98d3fa419c843ecc1fb27e854103c754fcad50f4f4bb02",
extract: {
format: "tar",
targetPath: "mutagen",
Expand All @@ -981,7 +981,7 @@ export const mutagenCliSpec: PluginToolSpec = {
platform: "windows",
architecture: "amd64",
url: `https://github.com/mutagen-io/mutagen/releases/download/v${mutagenVersion}/mutagen_windows_amd64_v${mutagenVersion}.zip`,
sha256: "3019ccb556afb39cf2213adcacab97576c4419f8d08d3a55d063a5c773ec6d35",
sha256: "438405c73c26078120472612613ad97d9dc8e318a0656ab88eb71ff4b0ca4eee",
extract: {
format: "zip",
targetPath: "mutagen.exe",
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/kubernetes/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ function makeImagePath({

export function getK8sUtilImagePath(registryDomain: string): DockerImageWithDigest {
const k8sUtilImageName: DockerImageWithDigest =
"gardendev/k8s-util:0.6.2@sha256:f51e7ce040e2e23bc0eaa7216e4d976f13786d96773ef7b8c8f349e7a63d74e9"
"gardendev/k8s-util:0.6.3@sha256:82d3a625c23d5bcd3007d15ffb45755ed8d83e9adfb0c2982d9a02e8288d2f13"

return makeImagePath({ imageName: k8sUtilImageName, registryDomain })
}

export function getK8sSyncUtilImagePath(registryDomain: string): DockerImageWithDigest {
const k8sSyncUtilImageName: DockerImageWithDigest =
"gardendev/k8s-sync:0.2.2@sha256:9ebcd84df4a3a55ae0ba95051cab521d249a4d2d7a15d04da7301c888c02347b"
"gardendev/k8s-sync:0.2.3@sha256:840dcb91a62e66b7e0dcdcfe5537a906c219d6bad6b0cc631407b4befab03af1"

return makeImagePath({ imageName: k8sSyncUtilImageName, registryDomain })
}
Expand Down
6 changes: 3 additions & 3 deletions images/k8s-sync/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ RUN apk add --no-cache wget

ARG TARGETARCH
# Get mutagen agent
RUN MUTAGEN_VERSION="0.17.6" && \
RUN MUTAGEN_VERSION="0.18.0" && \
mutagen_distr_name="mutagen_linux_${TARGETARCH}_v${MUTAGEN_VERSION}.tar.gz" && \
wget "https://github.com/mutagen-io/mutagen/releases/download/v${MUTAGEN_VERSION}/${mutagen_distr_name}" && \
if [ "$TARGETARCH" = "amd64" ]; then \
echo "1b826e121be59506e133d90dc2b8a0c820b92f480d9b2b230d8b389d6178a6cf ${mutagen_distr_name}" | sha256sum -c; \
echo "c82bde0ecd3810650087a8fd99e8baf4a3119b85a9cb14155a0d9209600374d4 ${mutagen_distr_name}" | sha256sum -c; \
elif [ "$TARGETARCH" = "arm64" ]; then \
echo "2a383cb572a1bdad83f7c4be3cc4a541a58e6c9e11e326ee4cc2d0e14f9d003a ${mutagen_distr_name}" | sha256sum -c; \
echo "c1621eede2cd9d36cd98d3fa419c843ecc1fb27e854103c754fcad50f4f4bb02 ${mutagen_distr_name}" | sha256sum -c; \
fi && \
tar xzf ${mutagen_distr_name} --to-stdout mutagen-agents.tar.gz \
| tar xz --to-stdout linux_${TARGETARCH} > /usr/local/bin/mutagen-agent && \
Expand Down
2 changes: 1 addition & 1 deletion images/k8s-sync/garden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: k8s-sync
description: Used by the kubernetes provider for sync setup
variables:
image-name: gardendev/k8s-sync
release-tag: 0.2.2 # Starting from version 0.2.0 Garden uses original Mutagen binaries instead of own fork.
release-tag: 0.2.3 # Starting from version 0.2.0 Garden uses original Mutagen binaries instead of own fork.
spec:
publishId: ${var.image-name}:${var.release-tag}
localId: ${var.image-name}
Expand Down
2 changes: 1 addition & 1 deletion images/k8s-util/garden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Used by the kubernetes provider for build-related activities
dependencies: [build.k8s-sync]
variables:
image-name: gardendev/k8s-util
release-tag: 0.6.2 # Starting from version 0.6.0 k8s-util uses k8s-sync 0.2.x.
release-tag: 0.6.3 # Starting from version 0.6.0 k8s-util uses k8s-sync 0.2.x.
spec:
publishId: ${var.image-name}:${var.release-tag}
localId: ${var.image-name}
Expand Down