From 420859b975e03111030412bb4520aa7997a36258 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 17:36:57 +0000 Subject: [PATCH 1/8] Setting up GitHub Classroom Feedback From 4f908291d392878cb428fb835587939e46acf76c Mon Sep 17 00:00:00 2001 From: Shuvani Date: Tue, 23 Nov 2021 21:26:18 +0300 Subject: [PATCH 2/8] All till IV section --- Dockerfile | 2 +- src/test/java/OrderUnitTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ac2bd1..7c3127e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,4 @@ FROM openjdk:16-alpine ENV PORT=8080 WORKDIR /app COPY target/re-21-SHADED.jar . -CMD ["java", "-jar", "re-21-SHADED.jar"] \ No newline at end of file +CMD ["java", "-jar", "re-21-SHADED.jar"] diff --git a/src/test/java/OrderUnitTest.java b/src/test/java/OrderUnitTest.java index 6855138..b71cad0 100644 --- a/src/test/java/OrderUnitTest.java +++ b/src/test/java/OrderUnitTest.java @@ -1,5 +1,7 @@ import org.junit.Test; + import java.util.List; + import static org.junit.Assert.assertEquals; public class OrderUnitTest { From b37f85b3fe864b7852fc1a7e02e5e35c6eaa1260 Mon Sep 17 00:00:00 2001 From: Shuvani Date: Tue, 23 Nov 2021 21:34:48 +0300 Subject: [PATCH 3/8] docker build --- src/test/java/OrderUnitTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/OrderUnitTest.java b/src/test/java/OrderUnitTest.java index b71cad0..33aaa2c 100644 --- a/src/test/java/OrderUnitTest.java +++ b/src/test/java/OrderUnitTest.java @@ -9,6 +9,7 @@ public class OrderUnitTest { @Test public void empty_order_by_default() { Order o = new Order(); + o.setOwner("Romeo"); o.setRecipient("Juliet"); List drinks = o.getDrinks(); From 7a24b8e4a2da336c39282fd206fbab3972061d8b Mon Sep 17 00:00:00 2001 From: Shuvani Date: Wed, 24 Nov 2021 16:33:59 +0300 Subject: [PATCH 4/8] not deploy --- .github/workflows/pipeline.yml | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 97c5ad6..0fb41d4 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -76,24 +76,24 @@ jobs: push: true tags: ${{ secrets.DOCKER_USERNAME }}/re21 - deploy-app: - needs: publish-image - runs-on: ubuntu-latest - steps: - - name: Pull the released image - run: docker pull ${{ secrets.DOCKER_USERNAME }}/re21 - - name: connect to the Heroku registry - run: | - docker login --username=_ \ - --password=${{ secrets.HEROKU_API_KEY }} \ - registry.heroku.com - - name: prepare the released image for deployment - run: | - docker tag ${{ secrets.DOCKER_USERNAME }}/re21 \ - registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web - - name: push the image to heroku - run: docker push registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web - - name: release the image into a new container - run: heroku container:release web -a ${{ secrets.HEROKU_APP_NAME }} - env: - HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }} \ No newline at end of file +# deploy-app: +# needs: publish-image +# runs-on: ubuntu-latest +# steps: +# - name: Pull the released image +# run: docker pull ${{ secrets.DOCKER_USERNAME }}/re21 +# - name: connect to the Heroku registry +# run: | +# docker login --username=_ \ +# --password=${{ secrets.HEROKU_API_KEY }} \ +# registry.heroku.com +# - name: prepare the released image for deployment +# run: | +# docker tag ${{ secrets.DOCKER_USERNAME }}/re21 \ +# registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web +# - name: push the image to heroku +# run: docker push registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web +# - name: release the image into a new container +# run: heroku container:release web -a ${{ secrets.HEROKU_APP_NAME }} +# env: +# HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }} From 8865550a3ef3363b8cfd3f29d816d490a3da6c0c Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 13:42:05 +0000 Subject: [PATCH 5/8] Update GitHub Classroom Autograding --- .github/classroom/autograding.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/classroom/autograding.json b/.github/classroom/autograding.json index c6eb57d..3097ea2 100644 --- a/.github/classroom/autograding.json +++ b/.github/classroom/autograding.json @@ -3,7 +3,7 @@ { "name": "Initial step", "setup": "", - "run": "mvn clean package", + "run": "mvn clean package -DskipTests=true", "input": "", "output": "", "comparison": "included", @@ -30,16 +30,6 @@ "timeout": 10, "points": 10 }, - { - "name": "Initial tests", - "setup": "", - "run": "mvn -q test", - "input": "", - "output": "", - "comparison": "included", - "timeout": 10, - "points": 10 - }, { "name": "Cucumber final tests", "setup": "", From 8fb0baa6df6be4ef5c113f01141ef8f4e12ebd1b Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 13:42:05 +0000 Subject: [PATCH 6/8] Update GitHub Classroom Autograding Workflow From ae06bca04daf668a356fe27e58b9aeadc1fbfe57 Mon Sep 17 00:00:00 2001 From: Shuvani Date: Wed, 24 Nov 2021 16:42:27 +0300 Subject: [PATCH 7/8] new --- src/main/java/Order.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Order.java b/src/main/java/Order.java index b265e21..af6ae1c 100644 --- a/src/main/java/Order.java +++ b/src/main/java/Order.java @@ -7,7 +7,6 @@ public class Order { private List contents = new LinkedList<>(); private double taxes = 0.0; - private String owner; public void setOwner(String who) { this.owner = who; } private String recipient; From 5a9349e63d69ca127e69f5c1cba19115f6f01012 Mon Sep 17 00:00:00 2001 From: JMB Date: Wed, 24 Nov 2021 14:53:11 +0100 Subject: [PATCH 8/8] Adding Java 16 to classroom autograding --- .github/workflows/classroom.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/classroom.yml b/.github/workflows/classroom.yml index 8e05703..dd41dad 100644 --- a/.github/workflows/classroom.yml +++ b/.github/workflows/classroom.yml @@ -8,4 +8,9 @@ runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Set up JDK 16 + uses: actions/setup-java@v2 + with: + java-version: '16' + distribution: 'adopt' - uses: education/autograding@v1