From 286e5c4979bf8d9985d367abd6429ef6cfcb0126 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:05:46 +0100 Subject: [PATCH 1/7] ci: update windows build setup --- .github/actions/setup/action.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index bc1797d5c..a951e2bf6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -18,8 +18,16 @@ runs: cache: 'yarn' registry-url: 'https://npm.pkg.github.com' - - name: Setup yarn + - name: Setup yarn (Unix) + if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }} run: chmod +x ${{ github.workspace }}/yarn.sh && ${{ github.workspace }}/yarn.sh shell: bash env: NPM_AUTH_TOKEN: ${{ inputs.npm-auth-token }} + + - name: Setup yarn (Windows) + if: ${{ runner.os == 'Windows' }} + run: powershell -Command \"Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process; ${{ github.workspace }}/yarn.ps1\" + shell: pwsh + env: + NPM_AUTH_TOKEN: ${{ inputs.npm-auth-token }} From 86a187a2f698891095e8c594ccada49fbc1900b3 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:06:07 +0100 Subject: [PATCH 2/7] chore: test with pr run --- .github/workflows/build-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 01543a535..d412ee4d6 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -5,6 +5,7 @@ on: push: branches: - main + pull_request: jobs: build: From f44a4683c83b3c366df0997e4db5c4fb4a795cf7 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:08:56 +0100 Subject: [PATCH 3/7] fix command --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index a951e2bf6..fd211f00b 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -27,7 +27,7 @@ runs: - name: Setup yarn (Windows) if: ${{ runner.os == 'Windows' }} - run: powershell -Command \"Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process; ${{ github.workspace }}/yarn.ps1\" + run: powershell -Command Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process; ${{ github.workspace }}/yarn.ps1 shell: pwsh env: NPM_AUTH_TOKEN: ${{ inputs.npm-auth-token }} From 20cb936e3cc56da30da5757c1d845d43fcdc1666 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:13:39 +0100 Subject: [PATCH 4/7] fix expression in ps1 script --- yarn.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.ps1 b/yarn.ps1 index 59718de76..2f607b759 100644 --- a/yarn.ps1 +++ b/yarn.ps1 @@ -47,7 +47,7 @@ yarn set version stable yarn set version 4.5.3 --yarn-path yarn config set nodeLinker node-modules yarn config set npmScopes.plentymarkets.npmRegistryServer "https://npm.pkg.github.com" -yarn config set npmScopes.plentymarkets.npmAlwaysAuth $true +yarn config set npmScopes.plentymarkets.npmAlwaysAuth "$true" if ($env:GITHUB_ACTIONS) { if (-not $env:NPM_AUTH_TOKEN) { From 5630600750185bbfa8f48ee79bc646bec675b918 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:15:17 +0100 Subject: [PATCH 5/7] fix ps1 script --- yarn.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.ps1 b/yarn.ps1 index 2f607b759..49879a972 100644 --- a/yarn.ps1 +++ b/yarn.ps1 @@ -47,7 +47,7 @@ yarn set version stable yarn set version 4.5.3 --yarn-path yarn config set nodeLinker node-modules yarn config set npmScopes.plentymarkets.npmRegistryServer "https://npm.pkg.github.com" -yarn config set npmScopes.plentymarkets.npmAlwaysAuth "$true" +yarn config set npmScopes.plentymarkets.npmAlwaysAuth true if ($env:GITHUB_ACTIONS) { if (-not $env:NPM_AUTH_TOKEN) { From 6686b337701074626955df815e87e8af645db621 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:23:33 +0100 Subject: [PATCH 6/7] fix script in package json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5eae9c767..64192e66c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "prepare": "is-ci || husky install", "update:sdk": "yarn up @plentymarkets/shop-api", "setup:unix": "chmod +x yarn.sh && ./yarn.sh && yarn build", - "setup:windows": "powershell -Command \"Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process; ./yarn.ps1\" && yarn build", + "setup:windows": "powershell -Command Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process; ./yarn.ps1 && yarn build", "turbo:disable-telemetry": "turbo telemetry disable", "build": "yarn turbo:disable-telemetry && turbo run build", "build:analyze": "yarn turbo:disable-telemetry && turbo run build:analyze", From 46674c9b5ee687444aa11aa35eb4c8b0ed9f0789 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:24:03 +0100 Subject: [PATCH 7/7] remove trigger for testing --- .github/workflows/build-windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index d412ee4d6..01543a535 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -5,7 +5,6 @@ on: push: branches: - main - pull_request: jobs: build: