From 08071fc0bccfaea40cbb06f07ad06f107a563c8c Mon Sep 17 00:00:00 2001
From: Stefan McShane <stefanmcshane@users.noreply.github.com>
Date: Wed, 13 Dec 2023 17:15:20 -0500
Subject: [PATCH 1/2] separate dev cli from integrations tests

---
 .../{dev_cli.yml => dev_cli_release.yml}      | 29 ++--------
 .github/workflows/integration_tests.yml       | 55 +++++++++++++++++++
 2 files changed, 60 insertions(+), 24 deletions(-)
 rename .github/workflows/{dev_cli.yml => dev_cli_release.yml} (78%)
 create mode 100644 .github/workflows/integration_tests.yml

diff --git a/.github/workflows/dev_cli.yml b/.github/workflows/dev_cli_release.yml
similarity index 78%
rename from .github/workflows/dev_cli.yml
rename to .github/workflows/dev_cli_release.yml
index 7642409de9..b63af9bd80 100644
--- a/.github/workflows/dev_cli.yml
+++ b/.github/workflows/dev_cli_release.yml
@@ -1,15 +1,12 @@
 on:
-  workflow_run:
-    workflows: ["Deploy Porter to Internal Tooling"]
-    branches: [master]
-    types: 
-      - completed
-name: Release dev cli and run integration tests
+  push:
+    tags:
+      - dev
+name: Release dev cli
 jobs:
   build-linux:
     name: Build Linux binaries
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -17,7 +14,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: '1.20.5'
+          go-version: "1.20.5"
           go-version-file: go.mod
       - name: Build Linux binaries
         run: |
@@ -89,19 +86,3 @@ jobs:
         run: |
           docker tag ghcr.io/porter-dev/porter/porter-cli:dev ghcr.io/porter-dev/porter/porter-cli:dev
           docker push ghcr.io/porter-dev/porter/porter-cli:dev
-  run-integration-tests:
-    name: run integration tests to test new build
-    runs-on: ubuntu-latest
-    needs: build-push-docker-cli
-    steps:   
-    - name: Porter app run
-      uses: porter-dev/porter-cli-action@v0.1.0
-      with:
-        command: app run app-integration-tests --job trigger
-      env:
-        PORTER_CLUSTER: "142"
-        PORTER_HOST: https://dashboard.internal-tools.porter.run
-        PORTER_PROJECT: "301"
-        PORTER_TOKEN: ${{ secrets.APP_INTEGRATION_PROJECT_TOKEN }}
-        PORTER_SERVICE: porter
-        PORTER_COMMIT: ${{ github.sha }}
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
new file mode 100644
index 0000000000..6a7983647b
--- /dev/null
+++ b/.github/workflows/integration_tests.yml
@@ -0,0 +1,55 @@
+on:
+  workflow_run:
+    workflows: ["Deploy Porter to Internal Tooling"]
+    branches: [master]
+    types:
+      - completed
+name: Run integration tests
+jobs:
+  build-linux:
+    name: Build Linux binaries
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          cache: false
+          go-version: "1.20.5"
+          go-version-file: go.mod
+      - name: Build Linux binaries
+        run: |
+          go build -ldflags="-w -s -X 'github.com/porter-dev/porter/cli/cmd/config.Version=dev_${{ github.sha }}' -X 'github.com/porter-dev/porter/cli/cmd/errors.SentryDSN=${{secrets.SENTRY_DSN}}'" -a -tags cli -o ./porter ./cli &
+          wait
+        env:
+          GOOS: linux
+          GOARCH: amd64
+          CGO_ENABLED: 0
+      - name: Zip Linux binaries
+        run: |
+          mkdir -p ./release/linux
+          zip --junk-paths ./release/linux/porter_dev_${{ github.sha }}_Linux_x86_64.zip ./porter
+      - name: Upload binaries
+        uses: actions/upload-artifact@v3
+        with:
+          path: ./release/linux
+          name: linux-binaries
+          retention-days: 1
+  run-integration-tests:
+    name: run integration tests to test new build
+    runs-on: ubuntu-latest
+    needs: build-linux
+    steps:
+      - name: Porter app run
+        uses: porter-dev/porter-cli-action@v0.1.0
+        with:
+          command: app run app-integration-tests --job trigger
+        env:
+          PORTER_CLUSTER: "142"
+          PORTER_HOST: https://dashboard.internal-tools.porter.run
+          PORTER_PROJECT: "301"
+          PORTER_TOKEN: ${{ secrets.APP_INTEGRATION_PROJECT_TOKEN }}
+          PORTER_SERVICE: porter
+          PORTER_COMMIT: ${{ github.sha }}

From 25d52316f7d487b12060eb54e8167998be18bd0d Mon Sep 17 00:00:00 2001
From: Stefan McShane <stefanmcshane@users.noreply.github.com>
Date: Wed, 13 Dec 2023 17:19:43 -0500
Subject: [PATCH 2/2] separate dev cli from integrations tests

---
 .github/workflows/integration_tests.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 6a7983647b..f56347296d 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -34,18 +34,21 @@ jobs:
       - name: Upload binaries
         uses: actions/upload-artifact@v3
         with:
-          path: ./release/linux
-          name: linux-binaries
+          name: go-binaries-cli
+          path: bin/
           retention-days: 1
   run-integration-tests:
     name: run integration tests to test new build
     runs-on: ubuntu-latest
     needs: build-linux
     steps:
-      - name: Porter app run
-        uses: porter-dev/porter-cli-action@v0.1.0
+      - name: Get built CLI
+        uses: actions/download-artifact@v3
         with:
-          command: app run app-integration-tests --job trigger
+          name: go-binaries-cli
+          path: bin/
+      - name: Porter app run
+        run: bin/porter app run app-integration-tests --job trigger
         env:
           PORTER_CLUSTER: "142"
           PORTER_HOST: https://dashboard.internal-tools.porter.run