From cc6ff262799f8a944062ce2a080dbe06acb0ad86 Mon Sep 17 00:00:00 2001 From: trivernis Date: Tue, 10 Nov 2020 20:33:25 +0100 Subject: [PATCH 1/5] Remove some platforms from docker build action Signed-off-by: trivernis --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e99ef6d..a62ffd7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -29,7 +29,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 push: true tags: | trivernis/snekcloud-server:latest \ No newline at end of file From 1324bc713cb6cd52bfe82250d0c0ac4f566c13df Mon Sep 17 00:00:00 2001 From: trivernis Date: Tue, 10 Nov 2020 20:34:18 +0100 Subject: [PATCH 2/5] Add task to actions branch Signed-off-by: trivernis --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a62ffd7..62b3da7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,7 @@ name: Docker on: push: - branches: [ main ] + branches: [ main, actions ] jobs: multi: From b8b27cbc0ae83d7867ca99b9cae63b6e3a683f6f Mon Sep 17 00:00:00 2001 From: trivernis Date: Tue, 10 Nov 2020 22:06:53 +0100 Subject: [PATCH 3/5] Make docker action dispatch-only Signed-off-by: trivernis --- .github/workflows/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 62b3da7..1e5e0a2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,8 +1,7 @@ name: Docker on: - push: - branches: [ main, actions ] + workflow_dispatch: jobs: multi: From 6759f42a96c793083bb0429c76fb9478d4d96c67 Mon Sep 17 00:00:00 2001 From: trivernis Date: Tue, 10 Nov 2020 22:08:52 +0100 Subject: [PATCH 4/5] Add full key to restore keys in rust action cache Signed-off-by: trivernis --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9267250..ee4ce59 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,6 +24,7 @@ jobs: target/**/deps key: ${{ runner.os }}-build-${{ hashFiles('**/package-lock.json') }} restore-keys: | + ${{ runner.os }}-build-${{ hashFiles('**/package-lock.json') }} ${{ runner.os }}-build- ${{ runner.os }}- - name: Build From 34482d06a84fb575041cf6976a9c66a1a435b72b Mon Sep 17 00:00:00 2001 From: trivernis Date: Tue, 10 Nov 2020 22:14:23 +0100 Subject: [PATCH 5/5] Change cache key to use Cargo.lock Signed-off-by: trivernis --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ee4ce59..c369dd4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,11 +22,11 @@ jobs: path: | target/**/build target/**/deps - key: ${{ runner.os }}-build-${{ hashFiles('**/package-lock.json') }} + target/**/incremental + key: ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }} restore-keys: | - ${{ runner.os }}-build-${{ hashFiles('**/package-lock.json') }} + ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }} ${{ runner.os }}-build- - ${{ runner.os }}- - name: Build run: cargo build --verbose - name: Run tests