From 045b0dffffced2ae806393b1aa53276a7dd44e9a Mon Sep 17 00:00:00 2001
From: Thomas <thomas.lapiana+github@pm.me>
Date: Sun, 11 Sep 2022 21:05:59 -0700
Subject: [PATCH 1/4] Update publish_docker.yaml

---
 .github/workflows/publish_docker.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish_docker.yaml b/.github/workflows/publish_docker.yaml
index 4eba7aaccf..54a313c1c9 100644
--- a/.github/workflows/publish_docker.yaml
+++ b/.github/workflows/publish_docker.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - unified-fides
     tags:
       - "*"
 

From a5899e29e8b120782d3962954a91b8d57356c4d6 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.lapiana+github@pm.me>
Date: Mon, 12 Sep 2022 12:13:15 +0800
Subject: [PATCH 2/4] unify the release dispatch event workflow

---
 .github/workflows/release_event.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release_event.yml b/.github/workflows/release_event.yml
index 7608257488..aea631781d 100644
--- a/.github/workflows/release_event.yml
+++ b/.github/workflows/release_event.yml
@@ -9,18 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Repository Dispatch Ctl
+      - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.DISPATCH_ACCESS_TOKEN }}
-          repository: ethyca/fidesctl-plus
-          event-type: new-fides-release
-          client-payload: '{"tag": "${{ github.event.release.tag_name }}", "url": "${{ github.event.release.html_url }}"}'
-
-      - name: Repository Dispatch Ops
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.DISPATCH_ACCESS_TOKEN }}
-          repository: ethyca/fidesops-plus
+          repository: ethyca/fides-plus
           event-type: new-fides-release
           client-payload: '{"tag": "${{ github.event.release.tag_name }}", "url": "${{ github.event.release.html_url }}"}'

From 6983e74f6c5d615ffb9ca5ffe127e54bdc837c07 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.lapiana+github@pm.me>
Date: Mon, 12 Sep 2022 12:13:38 +0800
Subject: [PATCH 3/4] remove the unused env vars in the compose file

---
 docker-compose.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9cf71b15c4..55f01250a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,8 +24,6 @@ services:
       FIDES__DATABASE__SERVER: "fides-db"
       FIDES__DEV_MODE: "True"
       FIDES__EXECUTION__WORKER_ENABLED: "True"
-      FIDES__HOT_RELOAD: ${HOT_RELOAD}
-      FIDES__LOG_PII: ${LOG_PII}
       FIDES_TEST_MODE: "True"
       FIDES__USER__ANALYTICS_OPT_OUT: "True"
     volumes:
@@ -81,8 +79,6 @@ services:
       - ./:/fides
     environment:
       - FIDES__DEV_MODE=True
-      - FIDES__LOG_PII=${LOG_PII}
-      - FIDES__HOT_RELOAD=${HOT_RELOAD}
       - FIDES__CLI__ANALYTICS_ID=${FIDES__CLI__ANALYTICS_ID}
       - FIDES__EXECUTION__WORKER_ENABLED=True
 

From df374c221b8200efbd937aa9390064e1c7898a16 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.lapiana+github@pm.me>
Date: Mon, 12 Sep 2022 12:14:14 +0800
Subject: [PATCH 4/4] upload to testpypi on pushes to `unified-fides`

---
 .github/workflows/publish_package.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish_package.yaml b/.github/workflows/publish_package.yaml
index 6c7a6bbddf..83759b5312 100644
--- a/.github/workflows/publish_package.yaml
+++ b/.github/workflows/publish_package.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - unified-fides
     tags:
       - "*"