ci: cache only artifacts

translate-tools · Jun 4, 2024 · f31d858 · f31d858
1 parent f506742
commit f31d858
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -20,10 +20,8 @@ runs:
       id: cache-thirdparty-restore
       uses: actions/cache/restore@v4
       with:
-        path: |
-          ./thirdparty/bergamot/build
-          ./.local/docker-volumes/bergamot-translator
-        key: ${{ runner.os }}-test1-${{ hashFiles('./thirdparty/bergamot/**', './.local/docker-volumes/bergamot-translator/**') }}
+        path: ./thirdparty/bergamot/build
+        key: dbg1-${{ runner.os }}-${{ hashFiles('./thirdparty/bergamot/**') }}
 
     - name: Compile third party artifacts with docker
       if: steps.cache-thirdparty-restore.outputs.cache-hit != 'true'
@@ -34,11 +32,9 @@ runs:
       id: cache-thirdparty-save
       uses: actions/cache/save@v4
       with:
-        path: |
-          ./thirdparty/bergamot/build
-          ./.local/docker-volumes/bergamot-translator
+        path: ./thirdparty/bergamot/build
         key: ${{ steps.cache-thirdparty-restore.outputs.cache-primary-key }}
 
     - name: Build app
       shell: bash
-      run: make build
+      run: make prepare buildAll packAll lintBuilds
diff --git a/makefile b/makefile
@@ -11,14 +11,13 @@ clean:
 	rm -rf ./build
 
 # Build section
-build: clean prepare
-	${MAKE} buildAll packAll lintBuilds
+build: clean prepare buildThirdparty buildAll packAll lintBuilds
 
 buildThirdparty:
 	mkdir -p ./thirdparty/bergamot/build && chmod 777 ./thirdparty/bergamot/build
 	${DOCKER_COMPOSE} run bergamot make build
 
-buildAll: buildThirdparty
+buildAll:
 	mkdir -p ./build
 	chmod 777 ./build
 	${DOCKER_COMPOSE} run linguist make buildFirefox buildChromium buildChrome