From ef5e6e7ef079332969a3ec34b3621eb232bec2fa Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 21 Oct 2022 02:27:53 +0800 Subject: [PATCH 1/3] Add temporary lines to DG --- docs/DeveloperGuide.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 4b9477a9451..5564961b8a7 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -165,6 +165,14 @@ Line 3 Line 4 Line 5 +Richard: +Line 1 +Line 2 +Line 3 +Line 4 +Line 5 +Line 6 + ### \[Proposed\] Undo/redo feature #### Proposed Implementation From 79166dcefde626c8d94d0824061a644320ade30d Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 21 Oct 2022 02:52:02 +0800 Subject: [PATCH 2/3] Add GitHub workflow for CD on master branch --- .github/workflows/build.yml | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000000..492c6305232 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,45 @@ +name: Build + +on: + workflow_dispatch: + push: + branches: + - master + tags: + - v* + +jobs: + jarfile: + runs-on: ubuntu-20.04 + steps: + - name: Checkout repositoru + uses: actions/checkout@main + with: + ref: master + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + - name: Setup JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + java-package: jdk+fx + - name: Create JAR file + run: ./gradlew shadowJar + - name: Create release on GitHub + id: create_release # We need the id to refer to it in the next step + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + body: Auto-created release from ${{ github.ref }} + - name: Upload JAR file to GitHub releases + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./build/libs/foodrem.jar + asset_name: foodrem.jar + asset_content_type: application/java-archive From bd68259cb4c3b1e8779c6f4b8a96e99d6c22bef9 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:03:03 +0800 Subject: [PATCH 3/3] Reformat AboutUs.md --- docs/AboutUs.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index c1bde2fbfcd..305f50e45af 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -16,7 +16,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](https://github.com/ferusel)] [[portfolio](team/ferusel.md)] -- Role: Team Lead +* Role: Team Lead ### Bryan Lim Jing Xiang @@ -25,7 +25,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](https://github.com/bryanljx)] [[portfolio](team/bryanljx.md)] -- Role: Tech Lead +* Role: Tech Lead ### Richard Dominick @@ -34,7 +34,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](https://github.com/RichDom2185)] [[portfolio](team/richdom2185.md)] -- Role: Tech Lead +* Role: Tech Lead ### Tan Wei Lie Eugene @@ -43,7 +43,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](https://github.com/eugenetanwl3881)] [[portfolio](team/eugenetanwl3881.md)] -- Role: Documentation +* Role: Documentation ### Tan Yi Xian @@ -52,4 +52,4 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](https://github.com/yixiann)] [[portfolio](team/yixiann.md)] -- Role: Secretary +* Role: Secretary