From 755a68783061329f77da6836ae4366f20c3eb13f Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 26 Jul 2021 20:22:27 +1000 Subject: [PATCH 1/5] fix portable readme download link --- README.md | 2 +- appveyor.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d78e7352b..e89558d57 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Flow Launcher. Dedicated to make your workflow flow more seamlessly. Aimed at be ### Installation -| [Windows 7 and up installer](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest) | [Portable](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/Flow-Launcher-Portable.zip) | `WinGet install "Flow Launcher"` | +| [Windows 7 and up installer](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest) | [Portable](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Portable.zip) | `WinGet install "Flow Launcher"` | | --------------------------------- | --------------------------------- | --------------------------------- | Windows may complain about security due to code not being signed, this will be completed at a later stage. If you downloaded from this repo, you are good to continue the set up. diff --git a/appveyor.yml b/appveyor.yml index f00c8aefe..3b7264586 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,6 +76,7 @@ environment: on_success: - ps: | + echo APPVEYOR_PULL_REQUEST_NUMBER if ($env:APPVEYOR_REPO_BRANCH -eq "master") { iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe From 268cde137430bcefb98a3261c4b45603032078ab Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 26 Jul 2021 21:12:57 +1000 Subject: [PATCH 2/5] fix WinGet deployment to only occur for non-pr master branch build --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3b7264586..32479026a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,8 +76,7 @@ environment: on_success: - ps: | - echo APPVEYOR_PULL_REQUEST_NUMBER - if ($env:APPVEYOR_REPO_BRANCH -eq "master") + if ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null) # branch only builds pr request number will be null, this ensures deployment only when it's non-pr master branch build { iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe .\wingetcreate.exe update Flow-Launcher.Flow-Launcher -s true -u https://github.com/Flow-Launcher/Flow.Launcher/releases/download/v$env:flowVersion/Flow-Launcher-v$env:flowVersion.exe -v $env:flowVersion -t $env:winget_token From 3e0ac6dacfa1f3271a57ffaf63268900b3eb29c9 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 27 Jul 2021 09:14:33 +1000 Subject: [PATCH 3/5] switch to publish WinGet on master branch tag build --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 32479026a..6d989b24e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,7 +76,7 @@ environment: on_success: - ps: | - if ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null) # branch only builds pr request number will be null, this ensures deployment only when it's non-pr master branch build + if ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG) { iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe .\wingetcreate.exe update Flow-Launcher.Flow-Launcher -s true -u https://github.com/Flow-Launcher/Flow.Launcher/releases/download/v$env:flowVersion/Flow-Launcher-v$env:flowVersion.exe -v $env:flowVersion -t $env:winget_token From 7f1c735365b3828910aeb9ba41c51a6b6220f8ed Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 28 Jul 2021 08:01:29 +1000 Subject: [PATCH 4/5] set nuget publish on tag only --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6d989b24e..f2b2c1308 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -49,7 +49,7 @@ deploy: api_key: secure: n80IeWR3pN81p0w4uXq4mO0TdTXoJSHHFL+yTB9YBJ0Wni2DjZGYwOFdaWzW4hRi on: - branch: master + APPVEYOR_REPO_TAG: true - provider: GitHub release: v$(flowVersion) From 1fb45981d5445f0029472019835a552cdb0451c5 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 28 Jul 2021 08:45:10 +1000 Subject: [PATCH 5/5] fix to string --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f2b2c1308..46ae3bdd4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,7 +76,7 @@ environment: on_success: - ps: | - if ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG) + if ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq "true") { iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe .\wingetcreate.exe update Flow-Launcher.Flow-Launcher -s true -u https://github.com/Flow-Launcher/Flow.Launcher/releases/download/v$env:flowVersion/Flow-Launcher-v$env:flowVersion.exe -v $env:flowVersion -t $env:winget_token