From 94d6a46ba6ff55bf4d71bdc5e04d599c33b2c8c4 Mon Sep 17 00:00:00 2001 From: David Gauldie Date: Fri, 26 Apr 2024 16:57:22 -0400 Subject: [PATCH] fix CI builds for taskrunners (#3459) --- .github/workflows/publish-funman-taskrunner.yml | 6 ------ .github/workflows/publish-gollm-taskrunner.yml | 6 ------ .github/workflows/publish-mira-taskrunner.yml | 6 ------ Makefile | 9 ++++++--- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/publish-funman-taskrunner.yml b/.github/workflows/publish-funman-taskrunner.yml index 0fcff1abe3..2802c2e359 100644 --- a/.github/workflows/publish-funman-taskrunner.yml +++ b/.github/workflows/publish-funman-taskrunner.yml @@ -49,9 +49,6 @@ jobs: java-version: 17 cache: gradle - - name: Build funman-taskrunner using Makefile - run: make image-funman-taskrunner - - name: Create image and push uses: docker/build-push-action@v5 with: @@ -91,9 +88,6 @@ jobs: java-version: 17 cache: gradle - - name: Build funman-taskrunner using Makefile - run: make image-funman-taskrunner - - name: Create image and push uses: docker/build-push-action@v5 with: diff --git a/.github/workflows/publish-gollm-taskrunner.yml b/.github/workflows/publish-gollm-taskrunner.yml index 693b38b231..f9a976f976 100644 --- a/.github/workflows/publish-gollm-taskrunner.yml +++ b/.github/workflows/publish-gollm-taskrunner.yml @@ -49,9 +49,6 @@ jobs: java-version: 17 cache: gradle - - name: Build gollm-taskrunner using Makefile - run: make image-gollm-taskrunner - - name: Create image and push uses: docker/build-push-action@v5 with: @@ -91,9 +88,6 @@ jobs: java-version: 17 cache: gradle - - name: Build gollm-taskrunner using Makefile - run: make image-gollm-taskrunner - - name: Create image and push uses: docker/build-push-action@v5 with: diff --git a/.github/workflows/publish-mira-taskrunner.yml b/.github/workflows/publish-mira-taskrunner.yml index 2138cef2c7..58611cd19c 100644 --- a/.github/workflows/publish-mira-taskrunner.yml +++ b/.github/workflows/publish-mira-taskrunner.yml @@ -49,9 +49,6 @@ jobs: java-version: 17 cache: gradle - - name: Build mira-taskrunner using Makefile - run: make image-mira-taskrunner - - name: Create image and push uses: docker/build-push-action@v5 with: @@ -91,9 +88,6 @@ jobs: java-version: 17 cache: gradle - - name: Build mira-taskrunner using Makefile - run: make image-mira-taskrunner - - name: Create image and push uses: docker/build-push-action@v5 with: diff --git a/Makefile b/Makefile index d3207ea3ff..3c730031a8 100755 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ clean-gollm-taskrunner: clean-gollm-taskrunner-base image-gollm-taskrunner: clean-gollm-taskrunner ./gradlew :packages:taskrunner:build -x test - mv $(PROJECT_DIR)/packages/taskrunner/build $(PROJECT_DIR)/packages/taskrunner/docker/build + mv $(PROJECT_DIR)/packages/taskrunner/build $(PROJECT_DIR)/packages/gollm/build TARGETS += mira-taskrunner clean-mira-taskrunner: clean-mira-taskrunner-base @@ -54,7 +54,7 @@ clean-mira-taskrunner: clean-mira-taskrunner-base image-mira-taskrunner: clean-mira-taskrunner ./gradlew :packages:taskrunner:build -x test - mv $(PROJECT_DIR)/packages/taskrunner/build $(PROJECT_DIR)/packages/taskrunner/docker/build + mv $(PROJECT_DIR)/packages/taskrunner/build $(PROJECT_DIR)/packages/mira/build TARGETS += funman-taskrunner clean-funman-taskrunner: clean-funman-taskrunner-base @@ -62,7 +62,7 @@ clean-funman-taskrunner: clean-funman-taskrunner-base image-funman-taskrunner: clean-funman-taskrunner ./gradlew :packages:taskrunner:build -x test - mv $(PROJECT_DIR)/packages/taskrunner/build $(PROJECT_DIR)/packages/taskrunner/docker/build + mv $(PROJECT_DIR)/packages/taskrunner/build $(PROJECT_DIR)/packages/funman/build @@ -78,14 +78,17 @@ clean-hmi-server-base: .PHONY: clean-gollm-taskrunner-base clean-gollm-taskrunner-base: + rm -rf $(PROJECT_DIR)/packages/gollm/build ./gradlew :packages:taskrunner:clean .PHONY: clean-mira-taskrunner-base clean-mira-taskrunner-base: + rm -rf $(PROJECT_DIR)/packages/mira/build ./gradlew :packages:taskrunner:clean .PHONY: clean-funman-taskrunner-base clean-funman-taskrunner-base: + rm -rf $(PROJECT_DIR)/packages/funman/build ./gradlew :packages:taskrunner:clean