fix CI builds for taskrunners (#3459)

DARPA-ASKEM · Apr 26, 2024 · 94d6a46 · 94d6a46
1 parent e3f7c20
commit 94d6a46
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -46,23 +46,23 @@ 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
  rm -rf $(PROJECT_DIR)/packages/taskrunner/docker/build
 
 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
  rm -rf $(PROJECT_DIR)/packages/taskrunner/docker/build
 
 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