From fe96abc12f492b77cbe2b392ebdc18a09bebd2b3 Mon Sep 17 00:00:00 2001
From: Jordan Potter <me@jordanpotter.com>
Date: Tue, 3 Oct 2023 08:54:42 -0700
Subject: [PATCH 1/2] Verify WireGuard IP address is different in CI

---
 .github/workflows/ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f02f455..ac1bd43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
 concurrency: ${{ github.workflow }}
 
 jobs:
-  build:
+  publish:
     name: Publish
     runs-on: ubuntu-latest
     permissions:
@@ -46,10 +46,12 @@ jobs:
           load: true
           tags: wireguard
 
-      - name: Test curl
+      - name: Test tunnel
         run: |
           docker run --rm -d --name wireguard --cap-add NET_ADMIN --cap-add SYS_MODULE --sysctl net.ipv4.conf.all.src_valid_mark=1 -v ${{ github.workspace }}/wireguard.conf:/etc/wireguard/wg0.conf wireguard
-          docker run --rm --net=container:wireguard curlimages/curl --retry 3 --retry-delay 5 ifconfig.io
+          normal_ip=$(docker run --rm curlimages/curl --retry 3 --retry-delay 5 ifconfig.io)
+          wireguard_ip=$(docker run --rm --net=container:wireguard curlimages/curl --retry 3 --retry-delay 5 ifconfig.io)
+          if [ "$normal_ip" = "$wireguard_ip" ]; then echo "normal ip and wireguard ip are the same" && exit 1; fi
           docker stop wireguard
 
       - name: Test kill switch

From eefe2e4c9abf4fe8e886105e217898fbda599b33 Mon Sep 17 00:00:00 2001
From: Jordan Potter <jordanpotter@users.noreply.github.com>
Date: Tue, 3 Oct 2023 09:32:07 -0700
Subject: [PATCH 2/2] Enable CI in PRs (#36)

Co-authored-by: Jordan Potter <me@jordanpotter.com>
---
 .github/workflows/ci.yml | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ac1bd43..7cf533b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,16 +2,17 @@ name: Continuous Integration
 
 on:
   push:
-    branches:
-      - main
   schedule:
     - cron: "0 0 * * TUE"
 
-concurrency: ${{ github.workflow }}
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+env:
+  platforms: "linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7"
 
 jobs:
-  publish:
-    name: Publish
+  ci:
+    name: Continuous Integration
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -31,7 +32,7 @@ jobs:
         run: sudo apt-get install wireguard
 
       - name: Download WireGuard config
-        run: echo "${{ secrets.WIREGUARD_CONF }}" > wireguard.conf
+        run: echo '${{ secrets.WIREGUARD_CONF }}' > wireguard.conf
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -100,19 +101,31 @@ jobs:
             jordanpotter/wireguard
             ghcr.io/${{ github.repository }}
           tags: |
-            type=raw,value=${{ steps.date.outputs.formattedTime }}
-            type=raw,value=latest,enable={{ is_default_branch }}
+            type=raw,value=${{ steps.date.outputs.formattedTime }},enable=${{ github.event_name == 'schedule' }}
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+
+      - name: Build images
+        if: ${{ github.ref != 'refs/heads/main' }}
+        uses: docker/build-push-action@v5
+        with:
+          pull: true
+          push: false
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          platforms: ${{ env.platforms }}
 
       - name: Build and push images
+        if: ${{ github.ref == 'refs/heads/main' }}
         uses: docker/build-push-action@v5
         with:
           pull: true
           push: true
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+          platforms: ${{ env.platforms }}
 
       - name: Update Docker Hub description
+        if: ${{ github.ref == 'refs/heads/main' }}
         uses: peter-evans/dockerhub-description@v3
         with:
           repository: jordanpotter/wireguard