Merge branch 'main' into cline

Author: yrobla

.github/workflows/run-on-pr.yml

@@ -20,6 +20,7 @@ jobs:
     with:
       artifact-name: "codegate-image"
   integration-tests:
+    if: github.event.pull_request.head.repo.full_name == 'stacklok/codegate'
     name: Integration Tests
     needs: [ci, image-build] # We need the image available in order to run the integration tests
     uses: ./.github/workflows/integration-tests.yml

.github/workflows/run-on-push.yml

@@ -13,7 +13,21 @@ jobs:
   ci:
     name: Build, Test & Lint
     uses: ./.github/workflows/ci.yml
+  image-build:
+    name: OCI Image - Build
+    needs: [ci] # No need to build the image if the CI fails
+    uses: ./.github/workflows/image-build.yml
+    with:
+      artifact-name: "codegate-image"
+  integration-tests:
+    name: Integration Tests
+    needs: [ci, image-build] # We need the image available in order to run the integration tests
+    uses: ./.github/workflows/integration-tests.yml
+    with:
+      artifact-name: "codegate-image"
+    secrets:
+      copilot-key: ${{ secrets.INTEGRATION_TESTS_COPILOT_KEY }}
   openapi:
     name: Generate the OpenAPI docs
     needs: [ci]
-    uses: ./.github/workflows/openapi.yml      
+    uses: ./.github/workflows/openapi.yml

Makefile

@@ -34,7 +34,7 @@ build: clean test
 image-build:
 	DOCKER_BUILDKIT=1 $(CONTAINER_BUILD) \
 		-f Dockerfile \
-		--build-arg LATEST_RELEASE=$(curl -s "https://api.github.com/repos/stacklok/codegate-ui/releases/latest" | grep '"zipball_url":' | cut -d '"' -f 4) \
+		--build-arg LATEST_RELEASE=$(shell curl -s "https://api.github.com/repos/stacklok/codegate-ui/releases/latest" | grep '"zipball_url":' | cut -d '"' -f 4) \
 		--build-arg CODEGATE_VERSION="$(shell git describe --tags --abbrev=0)-$(shell git rev-parse --short HEAD)-dev" \
 		-t codegate \
 		. \