diff --git a/.gitea/workflows/01_test.yaml b/.gitea/workflows/01_test.yaml index c134bd7..ee500ba 100644 --- a/.gitea/workflows/01_test.yaml +++ b/.gitea/workflows/01_test.yaml @@ -4,11 +4,12 @@ on: [push, pull_request] jobs: unit-test: container: - image: docker:dind + image: docker:dind--files-from manifest.txt volumes: - /data/.cache/act:/data/.cache/act - /var/lib/docker/image:/var/lib/docker/image - /var/lib/docker/overlay2:/var/lib/docker/overlay2 + - /workspace/fedi-image-bot/bot-mastodon-image-uploader/target:/tmp steps: - name: Starting docker daemon run: docker-init -- dockerd --host=unix:///var/run/docker.sock & @@ -18,18 +19,5 @@ jobs: uses: actions/checkout@v3 - name: Get access token from secret run: echo "${{ secrets.MASTODON_SECRET }}" > mastodon-data.toml - - name: Restore cached target - id: cache-restore - uses: actions/cache/restore@v3 - with: - path: | - target/ - key: ${{ runner.os }}-target - name: Run tests on docker - run: docker compose down -v && docker compose run bot t - - name: Save target - uses: actions/cache/save@v3 - with: - path: | - target/ - key: ${{ steps.cache-restore.outputs.cache-primary-key }} \ No newline at end of file + run: docker compose down -v && docker compose run bot t \ No newline at end of file diff --git a/.gitea/workflows/02_build.yaml b/.gitea/workflows/02_build.yaml index 0c67479..7be12ee 100644 --- a/.gitea/workflows/02_build.yaml +++ b/.gitea/workflows/02_build.yaml @@ -15,6 +15,7 @@ jobs: - /data/.cache/act:/data/.cache/act - /var/lib/docker/image:/var/lib/docker/image - /var/lib/docker/overlay2:/var/lib/docker/overlay2 + - /workspace/fedi-image-bot/bot-mastodon-image-uploader/target:/tmp steps: - name: Starting docker daemon run: docker-init -- dockerd --host=unix:///var/run/docker.sock & @@ -42,13 +43,6 @@ jobs: registry: git.fai.st username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - - name: Restore cached target - id: cache-restore - uses: actions/cache/restore@v3 - with: - path: | - target/ - key: ${{ runner.os }}-target - name: Build and push uses: docker/build-push-action@v4 with: @@ -56,10 +50,4 @@ jobs: context: . push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - - name: Save target - uses: actions/cache/save@v3 - with: - path: | - target/ - key: ${{ steps.cache-restore.outputs.cache-primary-key }} \ No newline at end of file + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file