From 17588be0efcb8c796c7b83e37d24d891e785707b Mon Sep 17 00:00:00 2001
From: miigotu <miigotu@gmail.com>
Date: Fri, 3 Jul 2020 03:18:59 -0400
Subject: [PATCH] Separate action to build single-arch docker image for github
 packages.

---
 .github/workflows/deploy.yaml     |  9 ++-------
 .github/workflows/github_pkg.yaml | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/github_pkg.yaml

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index b3b64bb87..734b8d187 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -44,14 +44,9 @@ jobs:
     - name: Docker Login and set build command
       if: success()
       id: login
-      env:
-        GITHUB_USERNAME: ${{ github.actor }}
-        GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_TOKEN }}
       run: |
-        echo "${GITHUB_PASSWORD}" | docker login --username "${GITHUB_USERNAME}" --password-stdin docker.pkg.github.com
-        echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin docker.io
+        # echo "${{ secrets.GITHUB_TOKEN }}" | docker login -u "${{ github.actor }}" --password-stdin docker.io
+        echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin docker.io
         echo ::set-output name=buildx::$(echo docker buildx build --output type=image,push=true \
           --platform ${{ steps.prepare.outputs.docker_platforms }} --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" \
           --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}")
diff --git a/.github/workflows/github_pkg.yaml b/.github/workflows/github_pkg.yaml
new file mode 100644
index 000000000..e445988df
--- /dev/null
+++ b/.github/workflows/github_pkg.yaml
@@ -0,0 +1,31 @@
+name: Publish Docker Image to GitHub
+on:
+  push:
+    branches:
+      - "submodules"
+      - "master"
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to GitHub Packages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+          fetch-depth: 1
+          persist-credentials: false
+          submodules: recursive
+      - name: Checkout submodules
+        uses: textbook/git-checkout-submodule-action@master
+        with:
+          remote: true
+      - name: Push to GitHub Packages
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.pkg.github.com
+          repository: miigotu/ps3toolchain/ps3dev
+          tag_with_ref: true
\ No newline at end of file