From 6044ca11143150edbd30e45700ce292717cdeca2 Mon Sep 17 00:00:00 2001 From: schklom <23263086+schklom@users.noreply.github.com> Date: Sat, 24 Feb 2024 23:16:19 +0000 Subject: [PATCH 1/6] Build when deb/* changes The build calls to Protonmail's repo and builds from it. When that repo changes (i.e. when deb/* changes), the image should be built again. Currently, that repo changed a few days ago, and the "build" image has not updated in a year. I don't see a reason to never update the image when the upstream repo updates frequently. --- .github/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 439396a4..b10f6fae 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,10 +8,12 @@ on: paths: - .github/workflows/build.yaml - build/* + - deb/* pull_request: paths: - .github/workflows/build.yaml - build/* + - deb/* env: DOCKER_REPO: shenxn/protonmail-bridge From 7aa2ed3de59ff0efa610f59a2b94208941d452f5 Mon Sep 17 00:00:00 2001 From: schklom <23263086+schklom@users.noreply.github.com> Date: Sat, 16 Mar 2024 19:14:34 +0000 Subject: [PATCH 2/6] Remove riscv64 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b10f6fae..fe1ee3d8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,7 +18,7 @@ on: env: DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev - PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64 + PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7 jobs: build: From 274973c884c3c9c23ef2cc634683c31db3420fde Mon Sep 17 00:00:00 2001 From: schklom <23263086+schklom@users.noreply.github.com> Date: Sat, 16 Mar 2024 19:16:29 +0000 Subject: [PATCH 3/6] Update build.yaml --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fe1ee3d8..b92e1479 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,6 +14,7 @@ on: - .github/workflows/build.yaml - build/* - deb/* + workflow_run: env: DOCKER_REPO: shenxn/protonmail-bridge From 13b5c14bcdc9d7fc1e7799eab76748012d2adcfc Mon Sep 17 00:00:00 2001 From: schklom <23263086+schklom@users.noreply.github.com> Date: Sat, 16 Mar 2024 19:17:15 +0000 Subject: [PATCH 4/6] Update build.yaml --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b92e1479..a8117e6b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ on: - .github/workflows/build.yaml - build/* - deb/* - workflow_run: + workflow_dispatch: env: DOCKER_REPO: shenxn/protonmail-bridge From 6bf1a9c29dd9e51a22d42b0f80a8c78d0a740246 Mon Sep 17 00:00:00 2001 From: schklom <23263086+schklom@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:58:14 +0000 Subject: [PATCH 5/6] Remove arm/v7 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a8117e6b..54780e0d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,7 +19,7 @@ on: env: DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev - PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7 + PLATFORMS: linux/amd64,linux/arm64/v8 jobs: build: From d837e2dce399659ac349cd0706c62e34bd278d2a Mon Sep 17 00:00:00 2001 From: schklom <23263086+schklom@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:58:59 +0000 Subject: [PATCH 6/6] Update Dockerfile --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 1971c403..475efdbd 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,5 @@ # Use carlosedp/golang for riscv64 support -FROM carlosedp/golang:1.18 AS build +FROM golang:latest AS build # Install dependencies RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev