From 383c8dd0128579c2dde9d9416761ad5bcce8f47a Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Mon, 12 Dec 2022 16:20:08 +0100 Subject: [PATCH 1/4] Update version and changelog --- changelog.txt | 4 ++++ src/release/release.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index e5f9a206..eba3145a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +v1.3.1 (Dec 12, 2022) +===================== +- Rename Theme Kit Access references to Theme Access https://github.com/Shopify/themekit/pull/984 + v1.3.0 (Jun 23, 2021) ===================== - Add messaging for Theme Access https://github.com/Shopify/themekit/pull/939 diff --git a/src/release/release.go b/src/release/release.go index 0e6f827b..30d6c4fe 100644 --- a/src/release/release.go +++ b/src/release/release.go @@ -30,7 +30,7 @@ var ( "windows-amd64": "theme.exe", } // ThemeKitVersion is the version build of the library - ThemeKitVersion, _ = version.NewVersion("1.3.0") + ThemeKitVersion, _ = version.NewVersion("1.3.1") ) const ( From 4f9c1eb4dc19f512652b36c789e7c9f02bf3ae08 Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Mon, 12 Dec 2022 17:02:35 +0100 Subject: [PATCH 2/4] Upgrade Go and drop support for darwin-386 --- Makefile | 1 - dev.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c57a11f9..7903f313 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ clean: ## Remove all temporary build artifacts all: clean bundle ## will build a binary for all platforms @export GOOS=windows GOARCH=386 EXT=.exe; $(MAKE) build; @export GOOS=windows GOARCH=amd64 EXT=.exe; $(MAKE) build; - @export GOOS=darwin GOARCH=386; $(MAKE) build; @export GOOS=darwin GOARCH=amd64; $(MAKE) build; @export GOOS=linux GOARCH=386; $(MAKE) build; @export GOOS=linux GOARCH=amd64; $(MAKE) build; diff --git a/dev.yml b/dev.yml index cec0fafc..6216c487 100644 --- a/dev.yml +++ b/dev.yml @@ -7,5 +7,5 @@ up: - mitmproxy - dep - go: - version: 1.13 + version: 1.17.13 modules: true From 23f424eadc282c0eecc485cb957450a50a5a8978 Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Mon, 12 Dec 2022 17:02:35 +0100 Subject: [PATCH 3/4] Upgrade Go and drop support for darwin-386 --- Makefile | 1 - dev.yml | 2 +- docs/scripts/install.py | 1 - scripts/install.py | 1 - src/release/release.go | 1 - src/release/release_test.go | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c57a11f9..7903f313 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ clean: ## Remove all temporary build artifacts all: clean bundle ## will build a binary for all platforms @export GOOS=windows GOARCH=386 EXT=.exe; $(MAKE) build; @export GOOS=windows GOARCH=amd64 EXT=.exe; $(MAKE) build; - @export GOOS=darwin GOARCH=386; $(MAKE) build; @export GOOS=darwin GOARCH=amd64; $(MAKE) build; @export GOOS=linux GOARCH=386; $(MAKE) build; @export GOOS=linux GOARCH=amd64; $(MAKE) build; diff --git a/dev.yml b/dev.yml index cec0fafc..6216c487 100644 --- a/dev.yml +++ b/dev.yml @@ -7,5 +7,5 @@ up: - mitmproxy - dep - go: - version: 1.13 + version: 1.17.13 modules: true diff --git a/docs/scripts/install.py b/docs/scripts/install.py index 680f8247..8582ff81 100755 --- a/docs/scripts/install.py +++ b/docs/scripts/install.py @@ -13,7 +13,6 @@ class Installer(object): LATEST_RELEASE_URL = "https://shopify-themekit.s3.amazonaws.com/releases/latest.json" ARCH_MAPPING = { "darwin x86_64": "darwin-amd64", - "darwin i386": "darwin-386", "linux x86_64": "linux-amd64", "linux i386": "linux-386", "freebsd x86_64": "freebsd-amd64", diff --git a/scripts/install.py b/scripts/install.py index 680f8247..8582ff81 100755 --- a/scripts/install.py +++ b/scripts/install.py @@ -13,7 +13,6 @@ class Installer(object): LATEST_RELEASE_URL = "https://shopify-themekit.s3.amazonaws.com/releases/latest.json" ARCH_MAPPING = { "darwin x86_64": "darwin-amd64", - "darwin i386": "darwin-386", "linux x86_64": "linux-amd64", "linux i386": "linux-386", "freebsd x86_64": "freebsd-amd64", diff --git a/src/release/release.go b/src/release/release.go index 30d6c4fe..8e028ab5 100644 --- a/src/release/release.go +++ b/src/release/release.go @@ -21,7 +21,6 @@ import ( var ( builds = map[string]string{ "darwin-amd64": "theme", - "darwin-386": "theme", "linux-386": "theme", "linux-amd64": "theme", "freebsd-386": "theme", diff --git a/src/release/release_test.go b/src/release/release_test.go index e81b5153..8eec126a 100644 --- a/src/release/release_test.go +++ b/src/release/release_test.go @@ -282,7 +282,6 @@ func TestBuildRelease(t *testing.T) { testplatforms := []platform{ {Name: "darwin-amd64", URL: "http://amazon/themekit", Digest: "d41d8cd98f00b204e9800998ecf8427e"}, - {Name: "darwin-386", URL: "http://amazon/themekit", Digest: "d41d8cd98f00b204e9800998ecf8427e"}, {Name: "linux-386", URL: "http://amazon/themekit", Digest: "d41d8cd98f00b204e9800998ecf8427e"}, {Name: "linux-amd64", URL: "http://amazon/themekit", Digest: "d41d8cd98f00b204e9800998ecf8427e"}, {Name: "windows-386", URL: "http://amazon/themekit", Digest: "d41d8cd98f00b204e9800998ecf8427e"}, From 281f5810b283b62068c6a7e31eb6b0d112fd3384 Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Mon, 12 Dec 2022 18:24:34 +0100 Subject: [PATCH 4/4] Update chocolatey files --- choco/themekit.nuspec | 8 ++++---- choco/tools/chocolateyinstall.ps1 | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/choco/themekit.nuspec b/choco/themekit.nuspec index ad27bae7..e8b13395 100644 --- a/choco/themekit.nuspec +++ b/choco/themekit.nuspec @@ -2,17 +2,17 @@ themekit - 1.2.0 + 1.3.1 https://github.com/Shopify/themekit/blob/master/choco Shopify Shopify Themekit Tim Anema - https://shopify.github.io/themekit/ - https://shopify.github.io/themekit/choco_assets/shopify-logo.png + https://shopify.dev/themes/tools/theme-kit/ + https://cdn.shopifycdn.net/static/images/logos/shopify-bag.png Shopify 2019 https://github.com/Shopify/themekit/blob/master/LICENSE https://github.com/Shopify/themekit - https://shopify.dev/tools/theme-kit + https://shopify.dev/themes/tools/theme-kit/ https://github.com/Shopify/themekit/issues themekit shopify Theme Kit is a command line tool for shopify themes. diff --git a/choco/tools/chocolateyinstall.ps1 b/choco/tools/chocolateyinstall.ps1 index d0f274bc..bf012ce3 100644 --- a/choco/tools/chocolateyinstall.ps1 +++ b/choco/tools/chocolateyinstall.ps1 @@ -2,11 +2,11 @@ $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" $packageName = $env:ChocolateyPackageName $file = "$($toolsDir)\theme.exe" -$version = "v1.2.0" +$version = "v1.3.1" $url = "https://shopify-themekit.s3.amazonaws.com/$($version)/windows-386/theme.exe" $url64 = "https://shopify-themekit.s3.amazonaws.com/$($version)/windows-amd64/theme.exe" -$checksum = '827727f12600cdc8f248029c36486d43' -$checksum64 = '7e407fe95e4124d1b3e99b66799f3fd9' +$checksum = '20292407e05210e43dd2a4ee0e660321' +$checksum64 = '8541545ada519c5a9f780b7eb05b5c02' $validExitCodes = @(0) Get-ChocolateyWebFile `