From 462c0d3e704da9b3687511270ff8b5f59381aad3 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Wed, 16 Dec 2020 13:02:25 +0100
Subject: [PATCH] Update the Dockerfile, use Github workflow

---
 .github/workflows/ci.yml | 58 ++++++++++++++++++++++++++++++++++++++++
 .github/workflows/pr.yml | 17 ++++++++++++
 Dockerfile               |  9 +++----
 README.md                | 12 ++++-----
 4 files changed, 85 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .github/workflows/pr.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..6459e92
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,58 @@
+name: CI-Release
+
+on:
+  push:
+    branches:
+      - main
+    
+jobs:
+  build-binary:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: build binary
+      run: |
+        docker build . -t builder
+        docker run --rm -v ${PWD}:/project builder make
+    - uses: actions/upload-artifact@master
+      with:
+       name: binary
+       path: "*.wps"
+  deploy-binary:
+    needs: build-binary
+    runs-on: ubuntu-18.04
+    steps:   
+    - name: Get environment variables
+      id: get_repository_name
+      run: |
+        echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") >> $GITHUB_ENV
+        echo DATETIME=$(echo $(date '+%Y%m%d-%H%M%S')) >> $GITHUB_ENV
+    - uses: actions/download-artifact@master
+      with:
+        name: binary
+        path: wiiu/plugins
+    - name: zip artifact
+      run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip wiiu
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
+        release_name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
+        draft: false
+        prerelease: true
+        body: |
+           Not a stable release:
+           ${{ github.event.head_commit.message }}
+    - name: Upload Release Asset
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+        asset_path: ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
+        asset_name: ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
+        asset_content_type: application/unknown
\ No newline at end of file
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 0000000..f21e109
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,17 @@
+name: CI-PR
+
+on: [pull_request]
+
+jobs:
+  build-binary:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: build binary
+      run: |
+        docker build . -t builder
+        docker run --rm -v ${PWD}:/project builder make
+    - uses: actions/upload-artifact@master
+      with:
+       name: binary
+       path: "*.wps"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index cc713ab..57f68ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
-FROM wups/core-with-wut:0.1
+FROM wiiuenv/devkitppc:20200810
 
-# Get dependencies
-COPY --from=wiiuwut/libutils:0.1 /artifacts $WUT_ROOT
-COPY --from=wiiuwut/controller_patcher:0.1 /artifacts $WUT_ROOT
+COPY --from=wiiuenv/wiiupluginsystem:20200829 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/controller_patcher:20201216 /artifacts $DEVKITPRO
 
-WORKDIR project
+WORKDIR project
\ No newline at end of file
diff --git a/README.md b/README.md
index 17a86c3..23e9ab0 100644
--- a/README.md
+++ b/README.md
@@ -64,20 +64,20 @@ In order to build this application you need serval libs:
 
 Install them (in this order) according to their README's. Don't forget the dependencies of the libs itself.
 
-### Building using the Dockerfile
-It's possible to use a docker image for building. This way you don't need anything installed on your host system.
+## Building via docker
 
 ```
-# Build docker image (only needed once
-docker build . -t hidtovpadwups-builder
+# Build docker image (only needed once)
+docker build . -t hid-to-vpad-plugin-builder
 
 # make 
-docker run -it --rm -v ${PWD}:/project hidtovpadwups-builder make
+docker run -it --rm -v ${PWD}:/project hid-to-vpad-plugin-builder make
 
 # make clean
-docker run -it --rm -v ${PWD}:/project hidtovpadwups-builder make clean
+docker run -it --rm -v ${PWD}:/project hid-to-vpad-plugin-builder make clean
 ```
 
+
 # Credits
 - A big thanks goes out to <b>dimok</b> for creating the HBL, the dynamic libs and every stuff he made. The "environment" of this app is copied from ddd, turned out to be a "hello world" with useful extra stuff.  
 - Also huge thanks to <b>FIX94</b> who initally created his gc-to-vpad. Helped me a lot! Thanks!