From 74e350dea8a903e9a1c89768d33e9b74ddca5d79 Mon Sep 17 00:00:00 2001
From: Zach Hyatt <zach@nano.org>
Date: Tue, 17 May 2022 10:03:08 -0700
Subject: [PATCH 1/7] Limit the publishing of public builds and Docker images
 to only the public repository

---
 .github/workflows/beta_artifacts.yml         |  1 +
 .github/workflows/live_artifacts.yml         |  1 +
 .github/workflows/test_network_artifacts.yml |  1 +
 ci/actions/deploy.sh                         | 17 +++++++++++------
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml
index 81bda274..103cb279 100644
--- a/.github/workflows/beta_artifacts.yml
+++ b/.github/workflows/beta_artifacts.yml
@@ -82,6 +82,7 @@ jobs:
           COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
       - name: Deploy Docker (nanocurrency/nano-beta)
+        if: ${{ github.repository == 'nanocurrency/nano-node' }}
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
index bc852f2c..c6fa6abd 100644
--- a/.github/workflows/live_artifacts.yml
+++ b/.github/workflows/live_artifacts.yml
@@ -81,6 +81,7 @@ jobs:
           COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
       - name: Deploy Docker (nanocurrency/nano)
+        if: ${{ github.repository == 'nanocurrency/nano-node' }}
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/test_network_artifacts.yml b/.github/workflows/test_network_artifacts.yml
index 991d90c4..f28f1a0f 100644
--- a/.github/workflows/test_network_artifacts.yml
+++ b/.github/workflows/test_network_artifacts.yml
@@ -82,6 +82,7 @@ jobs:
           COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
       - name: Deploy Docker (nanocurrency/nano)
+        if: ${{ github.repository == 'nanocurrency/nano-node' }}
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/ci/actions/deploy.sh b/ci/actions/deploy.sh
index 4aee6f1d..b5ba81ab 100755
--- a/ci/actions/deploy.sh
+++ b/ci/actions/deploy.sh
@@ -13,15 +13,20 @@ else
     BUILD="live"
 fi
 
+if [[ "${GITHUB_REPOSITORY}" -eq "nanocurrency/nano-node" ]]; then
+    S3_BUCKET="repo.nano.org"
+else
+    S3_BUCKET="private-build-repo"
+
 if [[ "$OS" == 'Linux' ]]; then
     sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 >$GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256
     sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.deb >$GITHUB_WORKSPACE/nano-node-$TAG-Linux.deb.sha256
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256 s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.deb s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Linux.deb --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.deb.sha256 s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Linux.deb.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.deb s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.deb --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.deb.sha256 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.deb.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
 else
     sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg >$GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Darwin.dmg --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256 s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Darwin.dmg.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Darwin.dmg --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Darwin.dmg.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
 fi

From d8bcf235fdc3a963b1f187f1bebb2be1a719e748 Mon Sep 17 00:00:00 2001
From: Zach Hyatt <zach@nano.org>
Date: Tue, 17 May 2022 10:37:36 -0700
Subject: [PATCH 2/7] Add limitations for Windows builds

---
 ci/actions/windows/deploy.ps1 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ci/actions/windows/deploy.ps1 b/ci/actions/windows/deploy.ps1
index fa5364ae..7a22d5be 100644
--- a/ci/actions/windows/deploy.ps1
+++ b/ci/actions/windows/deploy.ps1
@@ -10,13 +10,20 @@ else {
     $network_cfg = "live"
 }
 
+if ( ${env:GITHUB_REPOSITORY} -eq "nanocurrency/nano-node" ) {
+    $s3_bucket="repo.nano.org"
+}
+else {
+    $s3_bucket="private-build-repo"
+}
+
 $exe = Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.exe
 $zip = Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.zip
 
 ((Get-FileHash $exe).hash)+" "+(split-path -Path $exe -Resolve -leaf) | Out-file -FilePath "$exe.sha256"
 ((Get-FileHash $zip).hash)+" "+(split-path -Path $zip -Resolve -leaf) | Out-file -FilePath "$zip.sha256"
 
-aws s3 cp $exe s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.exe --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-aws s3 cp "$exe.sha256" s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.exe.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-aws s3 cp "$zip" s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.zip --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-aws s3 cp "$zip.sha256" s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.zip.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
\ No newline at end of file
+aws s3 cp $exe s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.exe --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$exe.sha256" s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.exe.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$zip" s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.zip --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$zip.sha256" s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.zip.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
\ No newline at end of file

From 7efbae9f053a2adeb99ffb3063e77e024217d7b8 Mon Sep 17 00:00:00 2001
From: Zach Hyatt <zach@nano.org>
Date: Tue, 17 May 2022 13:41:23 -0700
Subject: [PATCH 3/7] Use proper string comparison and end if for Linux

---
 ci/actions/deploy.sh          | 3 ++-
 ci/actions/windows/deploy.ps1 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/actions/deploy.sh b/ci/actions/deploy.sh
index b5ba81ab..9c5e9dd3 100755
--- a/ci/actions/deploy.sh
+++ b/ci/actions/deploy.sh
@@ -13,10 +13,11 @@ else
     BUILD="live"
 fi
 
-if [[ "${GITHUB_REPOSITORY}" -eq "nanocurrency/nano-node" ]]; then
+if [[ "${GITHUB_REPOSITORY:-}" == "nanocurrency/nano-node" ]]; then
     S3_BUCKET="repo.nano.org"
 else
     S3_BUCKET="private-build-repo"
+fi
 
 if [[ "$OS" == 'Linux' ]]; then
     sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 >$GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256
diff --git a/ci/actions/windows/deploy.ps1 b/ci/actions/windows/deploy.ps1
index 7a22d5be..3270ed16 100644
--- a/ci/actions/windows/deploy.ps1
+++ b/ci/actions/windows/deploy.ps1
@@ -10,7 +10,7 @@ else {
     $network_cfg = "live"
 }
 
-if ( ${env:GITHUB_REPOSITORY} -eq "nanocurrency/nano-node" ) {
+if ( ${env:GITHUB_REPOSITORY} == "nanocurrency/nano-node" ) {
     $s3_bucket="repo.nano.org"
 }
 else {

From 11636d10c356b6e558676552840d783ecac52691 Mon Sep 17 00:00:00 2001
From: Zach Hyatt <zach@nano.org>
Date: Tue, 17 May 2022 13:47:31 -0700
Subject: [PATCH 4/7] Provide more descriptive naems for docker deploy steps

---
 .github/workflows/beta_artifacts.yml         | 2 +-
 .github/workflows/live_artifacts.yml         | 2 +-
 .github/workflows/test_network_artifacts.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml
index 103cb279..314698fb 100644
--- a/.github/workflows/beta_artifacts.yml
+++ b/.github/workflows/beta_artifacts.yml
@@ -81,7 +81,7 @@ jobs:
         env:
           COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
-      - name: Deploy Docker (nanocurrency/nano-beta)
+      - name: Deploy Docker Hub (nanocurrency/nano-beta)
         if: ${{ github.repository == 'nanocurrency/nano-node' }}
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
index c6fa6abd..4290ddc2 100644
--- a/.github/workflows/live_artifacts.yml
+++ b/.github/workflows/live_artifacts.yml
@@ -80,7 +80,7 @@ jobs:
         env:
           COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
-      - name: Deploy Docker (nanocurrency/nano)
+      - name: Deploy Docker Hub (nanocurrency/nano)
         if: ${{ github.repository == 'nanocurrency/nano-node' }}
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
diff --git a/.github/workflows/test_network_artifacts.yml b/.github/workflows/test_network_artifacts.yml
index f28f1a0f..ed733244 100644
--- a/.github/workflows/test_network_artifacts.yml
+++ b/.github/workflows/test_network_artifacts.yml
@@ -81,7 +81,7 @@ jobs:
         env:
           COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
-      - name: Deploy Docker (nanocurrency/nano)
+      - name: Deploy Docker Hub (nanocurrency/nano-test)
         if: ${{ github.repository == 'nanocurrency/nano-node' }}
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:

From 2afa311a173d95f16f0dd73ae8f824ed279d25bf Mon Sep 17 00:00:00 2001
From: Zach Hyatt <zach@nano.org>
Date: Tue, 17 May 2022 15:09:48 -0700
Subject: [PATCH 5/7] Fix spacing

---
 .github/workflows/live_artifacts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
index e609a0fd..4a580323 100644
--- a/.github/workflows/live_artifacts.yml
+++ b/.github/workflows/live_artifacts.yml
@@ -83,7 +83,7 @@ jobs:
       - name: Build Docker (nanocurrency/nano)
         run: TRAVIS_TAG=${TAG} ci/actions/linux/docker-build.sh
       - name: Deploy Docker Hub (nanocurrency/nano)
-      if: ${{ github.repository == 'nanocurrency/nano-node' }}
+        if: ${{ github.repository == 'nanocurrency/nano-node' }}
         run: TRAVIS_TAG=${TAG} ci/actions/linux/docker-deploy.sh
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

From 6c31eefd6d2884cb8a19e420c73bab886a53aac3 Mon Sep 17 00:00:00 2001
From: Zach Hyatt <zach@nano.org>
Date: Fri, 20 May 2022 13:18:32 -0700
Subject: [PATCH 6/7] Allow build directory definition in secrets

---
 .github/workflows/beta_artifacts.yml         |  3 +++
 .github/workflows/live_artifacts.yml         |  5 ++++-
 .github/workflows/test_network_artifacts.yml |  3 +++
 ci/actions/deploy.sh                         | 18 +++++++++---------
 ci/actions/windows/deploy.ps1                | 12 ++++++------
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml
index fea09a84..d29800a1 100644
--- a/.github/workflows/beta_artifacts.yml
+++ b/.github/workflows/beta_artifacts.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
@@ -61,6 +62,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
@@ -119,6 +121,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/windows/deploy.ps1
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
index 4a580323..fc5c9599 100644
--- a/.github/workflows/live_artifacts.yml
+++ b/.github/workflows/live_artifacts.yml
@@ -35,6 +35,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
@@ -60,6 +61,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
@@ -93,7 +95,7 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GHCR_PAT }}
-      - name: Deploy Docker (ghcr.io
+      - name: Deploy Docker (ghcr.io)
         run: ci/actions/linux/ghcr_push.sh
 
   windows_job:
@@ -118,6 +120,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/windows/deploy.ps1
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
diff --git a/.github/workflows/test_network_artifacts.yml b/.github/workflows/test_network_artifacts.yml
index f29fb7b0..cd79847d 100644
--- a/.github/workflows/test_network_artifacts.yml
+++ b/.github/workflows/test_network_artifacts.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
@@ -61,6 +62,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
@@ -119,6 +121,7 @@ jobs:
       - name: Deploy Artifact
         run: ci/actions/windows/deploy.ps1
         env:
+          S3_BUILD_DIRECTORY: ${{ secrets.S3_BUILD_DIRECTORY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2
diff --git a/ci/actions/deploy.sh b/ci/actions/deploy.sh
index 9c5e9dd3..88bee52e 100755
--- a/ci/actions/deploy.sh
+++ b/ci/actions/deploy.sh
@@ -14,20 +14,20 @@ else
 fi
 
 if [[ "${GITHUB_REPOSITORY:-}" == "nanocurrency/nano-node" ]]; then
-    S3_BUCKET="repo.nano.org"
+    DIRECTORY=$BUILD
 else
-    S3_BUCKET="private-build-repo"
+    DIRECTORY="${S3_BUILD_DIRECTORY}/${BUILD}"
 fi
 
 if [[ "$OS" == 'Linux' ]]; then
     sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 >$GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256
     sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.deb >$GITHUB_WORKSPACE/nano-node-$TAG-Linux.deb.sha256
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.deb s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.deb --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.deb.sha256 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Linux.deb.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Linux.tar.bz2 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256 s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Linux.tar.bz2.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.deb s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Linux.deb --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/nano-node-$TAG-Linux.deb.sha256 s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Linux.deb.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
 else
     sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg >$GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Darwin.dmg --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256 s3://$S3_BUCKET/$BUILD/binaries/nano-node-$TAG-Darwin.dmg.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-fi
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Darwin.dmg --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256 s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Darwin.dmg.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+fi
\ No newline at end of file
diff --git a/ci/actions/windows/deploy.ps1 b/ci/actions/windows/deploy.ps1
index 3270ed16..d3bdfd4d 100644
--- a/ci/actions/windows/deploy.ps1
+++ b/ci/actions/windows/deploy.ps1
@@ -11,10 +11,10 @@ else {
 }
 
 if ( ${env:GITHUB_REPOSITORY} == "nanocurrency/nano-node" ) {
-    $s3_bucket="repo.nano.org"
+    $directory=$network_cfg
 }
 else {
-    $s3_bucket="private-build-repo"
+    $directory=${env:S3_BUILD_DIRECTORY}+"/"+$network_cfg
 }
 
 $exe = Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.exe
@@ -23,7 +23,7 @@ $zip = Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.zip
 ((Get-FileHash $exe).hash)+" "+(split-path -Path $exe -Resolve -leaf) | Out-file -FilePath "$exe.sha256"
 ((Get-FileHash $zip).hash)+" "+(split-path -Path $zip -Resolve -leaf) | Out-file -FilePath "$zip.sha256"
 
-aws s3 cp $exe s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.exe --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-aws s3 cp "$exe.sha256" s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.exe.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-aws s3 cp "$zip" s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.zip --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-aws s3 cp "$zip.sha256" s3://$s3_bucket/$network_cfg/binaries/nano-node-$env:TAG-win64.zip.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
\ No newline at end of file
+aws s3 cp $exe s3://repo.nano.org/$directory/binaries/nano-node-$env:TAG-win64.exe --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$exe.sha256" s3://repo.nano.org/$directory/binaries/nano-node-$env:TAG-win64.exe.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$zip" s3://repo.nano.org/$directory/binaries/nano-node-$env:TAG-win64.zip --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$zip.sha256" s3://repo.nano.org/$directory/binaries/nano-node-$env:TAG-win64.zip.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
\ No newline at end of file

From ec4d87e06eeb9709e1d7b2f6aa072450712bf51d Mon Sep 17 00:00:00 2001
From: Zach Hyatt <zach@nano.org>
Date: Fri, 20 May 2022 15:56:15 -0700
Subject: [PATCH 7/7] Fix improper string comparison

---
 ci/actions/windows/deploy.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/actions/windows/deploy.ps1 b/ci/actions/windows/deploy.ps1
index d3bdfd4d..dae7471d 100644
--- a/ci/actions/windows/deploy.ps1
+++ b/ci/actions/windows/deploy.ps1
@@ -10,7 +10,7 @@ else {
     $network_cfg = "live"
 }
 
-if ( ${env:GITHUB_REPOSITORY} == "nanocurrency/nano-node" ) {
+if ( ${env:GITHUB_REPOSITORY} -eq "nanocurrency/nano-node" ) {
     $directory=$network_cfg
 }
 else {