From 9e04b38d47038ab73a2c4c2e165a921038fcdef2 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Tue, 15 Aug 2023 14:18:24 -0700 Subject: [PATCH 01/32] uncomment windows build Signed-off-by: Ludvig Liljenberg --- build/azure-pipelines.release-template.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/azure-pipelines.release-template.yml b/build/azure-pipelines.release-template.yml index 69cc16ccb..9067dd9c3 100644 --- a/build/azure-pipelines.release-template.yml +++ b/build/azure-pipelines.release-template.yml @@ -202,10 +202,10 @@ stages: strategy: matrix: # Skip windows smoke tests until we can fix the windows agent - #windows: - # poolName: "windows" - # vmImage: "" - # GOMODCACHE: "C:/Users/porterci/go/pkg/mod" + windows: + poolName: "windows" + vmImage: "" + GOMODCACHE: "C:/Users/porterci/go/pkg/mod" linux: poolName: "Azure Pipelines" vmImage: "ubuntu-latest" From 982dd8d76aadf8f0bfd7fa636125ba49a445a4c7 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Tue, 15 Aug 2023 15:35:46 -0700 Subject: [PATCH 02/32] missed a file Signed-off-by: Ludvig Liljenberg --- build/azure-pipelines.pr-automatic.yml | 8 ++++---- build/azure-pipelines.release-template.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/azure-pipelines.pr-automatic.yml b/build/azure-pipelines.pr-automatic.yml index d93500334..cbcacfd52 100644 --- a/build/azure-pipelines.pr-automatic.yml +++ b/build/azure-pipelines.pr-automatic.yml @@ -174,10 +174,10 @@ stages: strategy: matrix: # Skip windows smoke tests until we fix the windows agent - #windows: - # poolName: "windows" - # vmImage: "" - # GOMODCACHE: "C:/Users/porterci/go/pkg/mod" + windows: + poolName: "windows" + vmImage: "windows-latest" + GOMODCACHE: "C:/Users/porterci/go/pkg/mod" linux: poolName: "Azure Pipelines" vmImage: "ubuntu-latest" diff --git a/build/azure-pipelines.release-template.yml b/build/azure-pipelines.release-template.yml index 9067dd9c3..3ba331f33 100644 --- a/build/azure-pipelines.release-template.yml +++ b/build/azure-pipelines.release-template.yml @@ -204,7 +204,7 @@ stages: # Skip windows smoke tests until we can fix the windows agent windows: poolName: "windows" - vmImage: "" + vmImage: "windows-latest" GOMODCACHE: "C:/Users/porterci/go/pkg/mod" linux: poolName: "Azure Pipelines" From 4a6f756878c3873a62cce66bd0a06a3652832b59 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Tue, 15 Aug 2023 16:16:37 -0700 Subject: [PATCH 03/32] Trigger test Signed-off-by: Ludvig Liljenberg From 352b40b52bdf8ff0930bf72ddc3423b5734606d7 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Tue, 15 Aug 2023 16:30:41 -0700 Subject: [PATCH 04/32] Trigger test 2 Signed-off-by: Ludvig Liljenberg From 0ae807de3ff57fd4fc8521ea1ad4b97ac60e032f Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Wed, 16 Aug 2023 09:45:28 -0700 Subject: [PATCH 05/32] trigger 3 Signed-off-by: Ludvig Liljenberg From 690a934105c5845351506053de9ed86048d0aaac Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Wed, 16 Aug 2023 10:40:22 -0700 Subject: [PATCH 06/32] trigger 4 Signed-off-by: Ludvig Liljenberg From 488c0e7390af7b5683a5235cca8600afb0db2354 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Wed, 16 Aug 2023 11:46:43 -0700 Subject: [PATCH 07/32] update dependency Signed-off-by: Ludvig Liljenberg --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index cea222830..084f53fa0 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,8 @@ module get.porter.sh/porter go 1.20 replace ( + // testing for windows + get.porter.sh/magefiles v0.6.0 => github.com/ludfjig/magefiles v0.0.0-20230816183934-fc987d349936 // See https://github.com/hashicorp/go-plugin/pull/127 and // https://github.com/hashicorp/go-plugin/pull/163 // Also includes branches we haven't PR'd yet: capture-yamux-logs, context-cancellation diff --git a/go.sum b/go.sum index cd00560fc..a5ddc1fec 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,6 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -get.porter.sh/magefiles v0.6.0 h1:6F28fuPGBAG9iiXjWzzEIoGG6M29lUEfj6l7Fe/wmv0= -get.porter.sh/magefiles v0.6.0/go.mod h1:KzKenKVauKKDhZ5FERVhqSz8m/xVSsRzOPseDA4UDIE= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA= @@ -562,6 +560,8 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/ludfjig/magefiles v0.0.0-20230816183934-fc987d349936 h1:wtsEJ2omH2A/XjJQIW0k+ctw3qJwa8xzI099O+uvGfQ= +github.com/ludfjig/magefiles v0.0.0-20230816183934-fc987d349936/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magefile/mage v1.13.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= From 56415ffdc64679e9d401fc1631ff6e7efb4f504e Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Wed, 16 Aug 2023 12:11:00 -0700 Subject: [PATCH 08/32] trying the docker installer Signed-off-by: Ludvig Liljenberg --- build/azure-pipelines.pr-automatic.yml | 5 +++++ build/azure-pipelines.release-template.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/build/azure-pipelines.pr-automatic.yml b/build/azure-pipelines.pr-automatic.yml index cbcacfd52..e5228f735 100644 --- a/build/azure-pipelines.pr-automatic.yml +++ b/build/azure-pipelines.pr-automatic.yml @@ -207,6 +207,11 @@ stages: key: "$(GOMODCACHE_KEY)" restoreKeys: $(GOMODCACHE_RESTOREKEYS) path: $(GOMODCACHE) + - task: DockerInstaller@0 + displayName: Docker Installer + inputs: + dockerVersion: 24.0.5 + releaseType: stable - task: Cache@2 displayName: Cache Go Build inputs: diff --git a/build/azure-pipelines.release-template.yml b/build/azure-pipelines.release-template.yml index 3ba331f33..6c286ad52 100644 --- a/build/azure-pipelines.release-template.yml +++ b/build/azure-pipelines.release-template.yml @@ -229,6 +229,11 @@ stages: key: "$(GOMODCACHE_KEY)" restoreKeys: $(GOMODCACHE_RESTOREKEYS) path: $(GOMODCACHE) + - task: DockerInstaller@0 + displayName: Docker Installer + inputs: + dockerVersion: 24.0.5 + releaseType: stable - task: Cache@2 displayName: Cache Go Build inputs: From 5d5e56e8ddf53b47da638c5e6f41ee51e92f54ab Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Wed, 16 Aug 2023 12:28:20 -0700 Subject: [PATCH 09/32] validate docker ps Signed-off-by: Ludvig Liljenberg --- build/azure-pipelines.pr-automatic.yml | 5 +++++ build/azure-pipelines.release-template.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/build/azure-pipelines.pr-automatic.yml b/build/azure-pipelines.pr-automatic.yml index e5228f735..0e008686f 100644 --- a/build/azure-pipelines.pr-automatic.yml +++ b/build/azure-pipelines.pr-automatic.yml @@ -212,6 +212,11 @@ stages: inputs: dockerVersion: 24.0.5 releaseType: stable + - task: CmdLine@2 + displayName: Validate docker + condition: eq(variables.poolName, 'windows') + inputs: + script: docker ps - task: Cache@2 displayName: Cache Go Build inputs: diff --git a/build/azure-pipelines.release-template.yml b/build/azure-pipelines.release-template.yml index 6c286ad52..031fd0137 100644 --- a/build/azure-pipelines.release-template.yml +++ b/build/azure-pipelines.release-template.yml @@ -234,6 +234,11 @@ stages: inputs: dockerVersion: 24.0.5 releaseType: stable + - task: CmdLine@2 + displayName: Validate docker + condition: eq(variables.poolName, 'windows') + inputs: + script: docker ps - task: Cache@2 displayName: Cache Go Build inputs: From f4f75418b85d48df25802b98e0eff859e45f6331 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Wed, 16 Aug 2023 13:23:36 -0700 Subject: [PATCH 10/32] add PS test Signed-off-by: Ludvig Liljenberg --- build/azure-pipelines.pr-automatic.yml | 12 +++++++++++- build/azure-pipelines.release-template.yml | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/build/azure-pipelines.pr-automatic.yml b/build/azure-pipelines.pr-automatic.yml index 0e008686f..9ce587622 100644 --- a/build/azure-pipelines.pr-automatic.yml +++ b/build/azure-pipelines.pr-automatic.yml @@ -216,7 +216,17 @@ stages: displayName: Validate docker condition: eq(variables.poolName, 'windows') inputs: - script: docker ps + script: | + docker -v + docker ps + - task: PowerShell@2 + displayName: Validate docker PS + condition: eq(variables.poolName, 'windows') + inputs: + targetType: 'inline' + script: | + docker -v + docker ps - task: Cache@2 displayName: Cache Go Build inputs: diff --git a/build/azure-pipelines.release-template.yml b/build/azure-pipelines.release-template.yml index 031fd0137..96feb7e25 100644 --- a/build/azure-pipelines.release-template.yml +++ b/build/azure-pipelines.release-template.yml @@ -238,17 +238,17 @@ stages: displayName: Validate docker condition: eq(variables.poolName, 'windows') inputs: - script: docker ps - - task: Cache@2 - displayName: Cache Go Build + script: | + docker -v + docker ps + - task: PowerShell@2 + displayName: Validate docker PS + condition: eq(variables.poolName, 'windows') inputs: - key: "$(GOCACHE_KEY)" - restoreKeys: $(GOCACHE_RESTOREKEYS) - path: $(GOCACHE) - - script: go run mage.go ConfigureAgent UseXBuildBinaries - displayName: "Setup Bin" - - script: mage -v TestSmoke - displayName: "Run Smoke Tests" + targetType: 'inline' + script: | + docker -v + docker ps - stage: Publish dependsOn: Validate From dbfb58be27b97887cd2c1b2bf4a7b2313929f798 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Wed, 16 Aug 2023 13:45:55 -0700 Subject: [PATCH 11/32] add startdocker command Signed-off-by: Ludvig Liljenberg --- build/azure-pipelines.pr-automatic.yml | 34 ++++++++++++---------- build/azure-pipelines.release-template.yml | 30 +++++++++---------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/build/azure-pipelines.pr-automatic.yml b/build/azure-pipelines.pr-automatic.yml index 9ce587622..b7db411a1 100644 --- a/build/azure-pipelines.pr-automatic.yml +++ b/build/azure-pipelines.pr-automatic.yml @@ -212,21 +212,21 @@ stages: inputs: dockerVersion: 24.0.5 releaseType: stable - - task: CmdLine@2 - displayName: Validate docker - condition: eq(variables.poolName, 'windows') - inputs: - script: | - docker -v - docker ps - - task: PowerShell@2 - displayName: Validate docker PS - condition: eq(variables.poolName, 'windows') - inputs: - targetType: 'inline' - script: | - docker -v - docker ps +# - task: CmdLine@2 +# displayName: Validate docker +# condition: eq(variables.poolName, 'windows') +# inputs: +# script: | +# docker -v +# docker ps +# - task: PowerShell@2 +# displayName: Validate docker PS +# condition: eq(variables.poolName, 'windows') +# inputs: +# targetType: 'inline' +# script: | +# docker -v +# docker ps - task: Cache@2 displayName: Cache Go Build inputs: @@ -235,5 +235,7 @@ stages: path: $(GOCACHE) - script: go run mage.go ConfigureAgent UseXBuildBinaries displayName: "Configure Agent" - - script: mage -v TestSmoke + - script: | + mage -v startdocker + mage -v TestSmoke displayName: "Run Smoke Tests" diff --git a/build/azure-pipelines.release-template.yml b/build/azure-pipelines.release-template.yml index 96feb7e25..fb4d7f4d9 100644 --- a/build/azure-pipelines.release-template.yml +++ b/build/azure-pipelines.release-template.yml @@ -234,21 +234,21 @@ stages: inputs: dockerVersion: 24.0.5 releaseType: stable - - task: CmdLine@2 - displayName: Validate docker - condition: eq(variables.poolName, 'windows') - inputs: - script: | - docker -v - docker ps - - task: PowerShell@2 - displayName: Validate docker PS - condition: eq(variables.poolName, 'windows') - inputs: - targetType: 'inline' - script: | - docker -v - docker ps +# - task: CmdLine@2 +# displayName: Validate docker +# condition: eq(variables.poolName, 'windows') +# inputs: +# script: | +# docker -v +# docker ps +# - task: PowerShell@2 +# displayName: Validate docker PS +# condition: eq(variables.poolName, 'windows') +# inputs: +# targetType: 'inline' +# script: | +# docker -v +# docker ps - stage: Publish dependsOn: Validate From 6b78144a95872914ec23641f82030f689940dc63 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Thu, 17 Aug 2023 13:42:41 -0700 Subject: [PATCH 12/32] trigger Signed-off-by: Ludvig Liljenberg --- build/azure-pipelines.pr-automatic.yml | 32 ++++++++++++---------- build/azure-pipelines.release-template.yml | 32 ++++++++++++---------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/build/azure-pipelines.pr-automatic.yml b/build/azure-pipelines.pr-automatic.yml index b7db411a1..4d85b8c3f 100644 --- a/build/azure-pipelines.pr-automatic.yml +++ b/build/azure-pipelines.pr-automatic.yml @@ -212,21 +212,23 @@ stages: inputs: dockerVersion: 24.0.5 releaseType: stable -# - task: CmdLine@2 -# displayName: Validate docker -# condition: eq(variables.poolName, 'windows') -# inputs: -# script: | -# docker -v -# docker ps -# - task: PowerShell@2 -# displayName: Validate docker PS -# condition: eq(variables.poolName, 'windows') -# inputs: -# targetType: 'inline' -# script: | -# docker -v -# docker ps + - task: CmdLine@2 + displayName: Validate docker + condition: eq(variables.poolName, 'windows') + inputs: + script: | + docker info + docker -v + docker ps + - task: PowerShell@2 + displayName: Validate docker PS + condition: eq(variables.poolName, 'windows') + inputs: + targetType: 'inline' + script: | + docker info + docker -v + docker ps - task: Cache@2 displayName: Cache Go Build inputs: diff --git a/build/azure-pipelines.release-template.yml b/build/azure-pipelines.release-template.yml index fb4d7f4d9..77a85dc15 100644 --- a/build/azure-pipelines.release-template.yml +++ b/build/azure-pipelines.release-template.yml @@ -234,21 +234,23 @@ stages: inputs: dockerVersion: 24.0.5 releaseType: stable -# - task: CmdLine@2 -# displayName: Validate docker -# condition: eq(variables.poolName, 'windows') -# inputs: -# script: | -# docker -v -# docker ps -# - task: PowerShell@2 -# displayName: Validate docker PS -# condition: eq(variables.poolName, 'windows') -# inputs: -# targetType: 'inline' -# script: | -# docker -v -# docker ps + - task: CmdLine@2 + displayName: Validate docker + condition: eq(variables.poolName, 'windows') + inputs: + script: | + docker info + docker -v + docker ps + - task: PowerShell@2 + displayName: Validate docker PS + condition: eq(variables.poolName, 'windows') + inputs: + targetType: 'inline' + script: | + docker info + docker -v + docker ps - stage: Publish dependsOn: Validate From 309631535aa00da254ccec8044a500b68d801a74 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 09:52:12 -0700 Subject: [PATCH 13/32] test gh actions Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/smoketest-windows.yaml diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml new file mode 100644 index 000000000..2597cffbb --- /dev/null +++ b/.github/workflows/smoketest-windows.yaml @@ -0,0 +1,21 @@ +name: Go package + +on: [push] + +jobs: + build: + + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: '1.20' + + - name: Build + run: go run mage.go build + + - name: SmokeTest + run: go run mage.go testsmoke From 7f9483b3869de057612aa39d49b4bff0fe0b2ac3 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 09:56:00 -0700 Subject: [PATCH 14/32] trigger Signed-off-by: Ludvig Liljenberg From 3b3f2048ec0e88146be0fe236defbec2e9610d7c Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 10:00:18 -0700 Subject: [PATCH 15/32] test2 Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index 2597cffbb..48d7c229e 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -1,5 +1,5 @@ name: Go package - +run-name: windows test on: [push] jobs: From 877d74c558480168ae333a1da8c7841717177ba9 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 10:07:57 -0700 Subject: [PATCH 16/32] fix Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index 48d7c229e..df7c033ae 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -1,6 +1,12 @@ name: Go package run-name: windows test -on: [push] +on: + push: + branches: + - windows_test + pull_request: + branches: + - windows_test jobs: build: From 6233bce8bc8cf0fb083ce24e8b1f6168f143242a Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 10:09:49 -0700 Subject: [PATCH 17/32] remove newline Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index df7c033ae..4f62b458b 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -10,18 +10,14 @@ on: jobs: build: - runs-on: windows-latest steps: - uses: actions/checkout@v3 - - name: Set up Go uses: actions/setup-go@v4 with: go-version: '1.20' - - name: Build run: go run mage.go build - - name: SmokeTest run: go run mage.go testsmoke From 18f225cf1bf940301204062592d7ed412411ed87 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 10:19:50 -0700 Subject: [PATCH 18/32] please Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index 4f62b458b..41001c5fd 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -1,12 +1,9 @@ name: Go package run-name: windows test on: - push: - branches: - - windows_test - pull_request: - branches: - - windows_test + workflow_dispatch: {} + push: {} + pull_request: {} jobs: build: From 98bcf12a9a75bd46b7c75dcf8b65403811278a73 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 10:28:17 -0700 Subject: [PATCH 19/32] update go.mod Signed-off-by: Ludvig Liljenberg --- go.mod | 2 -- go.sum | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 084f53fa0..cea222830 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,6 @@ module get.porter.sh/porter go 1.20 replace ( - // testing for windows - get.porter.sh/magefiles v0.6.0 => github.com/ludfjig/magefiles v0.0.0-20230816183934-fc987d349936 // See https://github.com/hashicorp/go-plugin/pull/127 and // https://github.com/hashicorp/go-plugin/pull/163 // Also includes branches we haven't PR'd yet: capture-yamux-logs, context-cancellation diff --git a/go.sum b/go.sum index a5ddc1fec..7a8fe859d 100644 --- a/go.sum +++ b/go.sum @@ -41,6 +41,7 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +get.porter.sh/magefiles v0.6.0/go.mod h1:KzKenKVauKKDhZ5FERVhqSz8m/xVSsRzOPseDA4UDIE= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA= From 26070eb2f66680df1cc8674e54f65f0c18836663 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 10:31:54 -0700 Subject: [PATCH 20/32] go.sum Signed-off-by: Ludvig Liljenberg --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 7a8fe859d..842623cd6 100644 --- a/go.sum +++ b/go.sum @@ -41,6 +41,7 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +get.porter.sh/magefiles v0.6.0 h1:6F28fuPGBAG9iiXjWzzEIoGG6M29lUEfj6l7Fe/wmv0= get.porter.sh/magefiles v0.6.0/go.mod h1:KzKenKVauKKDhZ5FERVhqSz8m/xVSsRzOPseDA4UDIE= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0= From 7825bf3149091cb1e2aeea39c427b414969e5b1a Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 11:04:42 -0700 Subject: [PATCH 21/32] fix Signed-off-by: Ludvig Liljenberg --- go.mod | 2 ++ go.sum | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index cea222830..b073281ee 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,8 @@ module get.porter.sh/porter go 1.20 replace ( + // testing for windows + get.porter.sh/magefiles v0.6.0 => github.com/ludfjig/magefiles v0.0.0-20230818175759-59b69bdd9f0d // See https://github.com/hashicorp/go-plugin/pull/127 and // https://github.com/hashicorp/go-plugin/pull/163 // Also includes branches we haven't PR'd yet: capture-yamux-logs, context-cancellation diff --git a/go.sum b/go.sum index 842623cd6..50bf833f9 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,6 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -get.porter.sh/magefiles v0.6.0 h1:6F28fuPGBAG9iiXjWzzEIoGG6M29lUEfj6l7Fe/wmv0= -get.porter.sh/magefiles v0.6.0/go.mod h1:KzKenKVauKKDhZ5FERVhqSz8m/xVSsRzOPseDA4UDIE= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA= @@ -562,8 +560,8 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/ludfjig/magefiles v0.0.0-20230816183934-fc987d349936 h1:wtsEJ2omH2A/XjJQIW0k+ctw3qJwa8xzI099O+uvGfQ= -github.com/ludfjig/magefiles v0.0.0-20230816183934-fc987d349936/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg= +github.com/ludfjig/magefiles v0.0.0-20230818175759-59b69bdd9f0d h1:vk/pFIc9HLQey0BOIBNbb2ci6/gml3u/4p4D7C5b8P8= +github.com/ludfjig/magefiles v0.0.0-20230818175759-59b69bdd9f0d/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magefile/mage v1.13.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= From 6a062fab48b4aa9fbe7161cf2d2432cf9e4924b2 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 11:35:02 -0700 Subject: [PATCH 22/32] added nat Signed-off-by: Ludvig Liljenberg --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b073281ee..6d3434dc6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 replace ( // testing for windows - get.porter.sh/magefiles v0.6.0 => github.com/ludfjig/magefiles v0.0.0-20230818175759-59b69bdd9f0d + get.porter.sh/magefiles v0.6.0 => github.com/ludfjig/magefiles v0.0.0-20230818183235-007f40840672 // See https://github.com/hashicorp/go-plugin/pull/127 and // https://github.com/hashicorp/go-plugin/pull/163 // Also includes branches we haven't PR'd yet: capture-yamux-logs, context-cancellation diff --git a/go.sum b/go.sum index 50bf833f9..dbb1fda00 100644 --- a/go.sum +++ b/go.sum @@ -560,8 +560,8 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/ludfjig/magefiles v0.0.0-20230818175759-59b69bdd9f0d h1:vk/pFIc9HLQey0BOIBNbb2ci6/gml3u/4p4D7C5b8P8= -github.com/ludfjig/magefiles v0.0.0-20230818175759-59b69bdd9f0d/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg= +github.com/ludfjig/magefiles v0.0.0-20230818183235-007f40840672 h1:iiVjppfnmxhXFWFOnpFEK9LYXhYKNazRie7qiVHOjzM= +github.com/ludfjig/magefiles v0.0.0-20230818183235-007f40840672/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magefile/mage v1.13.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= From 8d9c1daf02397fc3deea3f8aee65a7a7d7d28299 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 11:58:46 -0700 Subject: [PATCH 23/32] xbuildall Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index 41001c5fd..d3ae0c516 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -15,6 +15,6 @@ jobs: with: go-version: '1.20' - name: Build - run: go run mage.go build + run: go run mage.go xbuildall - name: SmokeTest run: go run mage.go testsmoke From 64ebdf1cf1c7157474c9ec5b2667748a7b5cdd4e Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 13:53:38 -0700 Subject: [PATCH 24/32] add host alias windows Signed-off-by: Ludvig Liljenberg --- magefile.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/magefile.go b/magefile.go index 039261c4d..53e24ed38 100644 --- a/magefile.go +++ b/magefile.go @@ -606,6 +606,10 @@ func TryRegisterLocalHostAlias() { } err := shx.RunV("sudo", "bash", "-c", "echo 127.0.0.1 porter-test-registry >> /etc/hosts") + if runtime.GOOS == "windows" { + err := shx.RunV("cmd.exe", "/c", "echo 127.0.0.1 porter-test-registry >> c:\\Windows\\System32\\drivers\\etc\\hosts") + } + if err != nil { fmt.Println("skipping registering the porter-test-registry hostname alias: could not write to /etc/hosts") return From 5fbc9da32f2c912058a1fda40c00cb726ab58b79 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 18 Aug 2023 14:08:48 -0700 Subject: [PATCH 25/32] fix typo Signed-off-by: Ludvig Liljenberg --- magefile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magefile.go b/magefile.go index 53e24ed38..a8b346d65 100644 --- a/magefile.go +++ b/magefile.go @@ -607,7 +607,7 @@ func TryRegisterLocalHostAlias() { err := shx.RunV("sudo", "bash", "-c", "echo 127.0.0.1 porter-test-registry >> /etc/hosts") if runtime.GOOS == "windows" { - err := shx.RunV("cmd.exe", "/c", "echo 127.0.0.1 porter-test-registry >> c:\\Windows\\System32\\drivers\\etc\\hosts") + err = shx.RunV("cmd.exe", "/c", "echo 127.0.0.1 porter-test-registry >> c:\\Windows\\System32\\drivers\\etc\\hosts") } if err != nil { From 226d5ff0d0b6c9b6b9521ed200d30e758904fca7 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 25 Aug 2023 16:31:42 -0700 Subject: [PATCH 26/32] test selfrunner Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index d3ae0c516..5a77e56cb 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: windows-latest + runs-on: self-hosted steps: - uses: actions/checkout@v3 - name: Set up Go From 26e629b635afca7fd232cdaf0f2634fad2139794 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 25 Aug 2023 16:45:53 -0700 Subject: [PATCH 27/32] trigger Signed-off-by: Ludvig Liljenberg From 33fe342ddc7f5340168750f92f6202e9d43d4b43 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Fri, 25 Aug 2023 17:55:14 -0700 Subject: [PATCH 28/32] trigger Signed-off-by: Ludvig Liljenberg From 6ec229de96752f7add4594ce33e2c5bfe43f786a Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Mon, 28 Aug 2023 09:58:02 -0700 Subject: [PATCH 29/32] trigger Signed-off-by: Ludvig Liljenberg From a823dba431380f1bd1a57a5ead5b5377c5d0fcb5 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Mon, 28 Aug 2023 11:20:48 -0700 Subject: [PATCH 30/32] trigger Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index 5a77e56cb..d43c17415 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -14,6 +14,7 @@ jobs: uses: actions/setup-go@v4 with: go-version: '1.20' + cache: false - name: Build run: go run mage.go xbuildall - name: SmokeTest From 6a3c4e6c9de80556e877d7b4d5cc828441e74a59 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Mon, 28 Aug 2023 11:48:32 -0700 Subject: [PATCH 31/32] trigger Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index d43c17415..ff71d0459 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -13,7 +13,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' cache: false - name: Build run: go run mage.go xbuildall From 964b4802fba324174a99de8f46f94b12ceb384fd Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Mon, 28 Aug 2023 12:30:47 -0700 Subject: [PATCH 32/32] trigger2 Signed-off-by: Ludvig Liljenberg --- .github/workflows/smoketest-windows.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smoketest-windows.yaml b/.github/workflows/smoketest-windows.yaml index ff71d0459..4b56c70bf 100644 --- a/.github/workflows/smoketest-windows.yaml +++ b/.github/workflows/smoketest-windows.yaml @@ -16,6 +16,6 @@ jobs: go-version: '1.21' cache: false - name: Build - run: go run mage.go xbuildall + run: go run mage.go -v xbuildall - name: SmokeTest - run: go run mage.go testsmoke + run: go run mage.go -v testsmoke