Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed concurrency and environment code in workflow #4

Merged
merged 1 commit into from
Apr 13, 2024
Merged

Removed concurrency and environment code in workflow #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/static.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@
name: Deploy
on: [push]

concurrency: production

jobs:
deploy:
name: "Deploy to server"
runs-on: ubuntu-latest

environment: production

steps:
- name: configure SSH
run: |
Expand Down
6 changes: 3 additions & 3 deletions index.html → html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ <h1>LEADERBOARD</h1>



<script src="bootstrap-5.3.3-dist/js/bootstrap.js"></script>
<script src="bootstrap-5.3.3-dist/js/js.js"></script>
<script src="../bootstrap-5.3.3-dist/js/bootstrap.js"></script>
<script src="../bootstrap-5.3.3-dist/js/js.js"></script>
<script src="https://unpkg.com/aos@next/dist/aos.js"></script>
<script src="bootstrap-5.3.3-dist/js/usernameValidation.js"></script>
<script src="../bootstrap-5.3.3-dist/js/usernameValidation.js"></script>

<script>AOS.init();</script>
<script src="usernameValidation.js"></script>
Expand Down
10 changes: 5 additions & 5 deletions match.html → html/match.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<title id="appName"></title>
<meta name="author" content="Tien Dung Le">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="bootstrap-5.3.3-dist/css/bootstrap.css">
<link rel="stylesheet" href="bootstrap-5.3.3-dist/css/styling.css">
<link rel="script" href="bootstrap-5.3.3-dist/js/js.js">
<link rel="stylesheet" href="../bootstrap-5.3.3-dist/css/bootstrap.css">
<link rel="stylesheet" href="../bootstrap-5.3.3-dist/css/styling.css">
<link rel="script" href="../bootstrap-5.3.3-dist/js/js.js">
<!--suppress JSUnresolvedLibraryURL -->
<link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
<style>
Expand Down Expand Up @@ -125,8 +125,8 @@
</div>
</section>

<script src="bootstrap-5.3.3-dist/js/bootstrap.js"></script>
<script src="bootstrap-5.3.3-dist/js/js.js"></script>
<script src="../bootstrap-5.3.3-dist/js/bootstrap.js"></script>
<script src="../bootstrap-5.3.3-dist/js/js.js"></script>
<script src="https://unpkg.com/aos@next/dist/aos.js"></script>
<script>
let userJSON = localStorage.getItem("userJSON")
Expand Down
Binary file modified target/classes/com/cse3310/App.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/Coordinate.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/Game.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/HttpServer$1.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/HttpServer.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/Locations.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/ServerEvent.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/User.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/com/cse3310/UserEvent.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/cse3310-wordsearch.jar
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions target/surefire-reports/TEST-com.cse3310.AppTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.05" tests="1" errors="0" skipped="0" failures="0">
<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.051" tests="1" errors="0" skipped="0" failures="0">
<properties>
<property name="java.specification.version" value="21"/>
<property name="sun.jnu.encoding" value="UTF-8"/>
Expand All @@ -11,7 +11,7 @@
<property name="java.vm.specification.version" value="21"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.boot.library.path" value="/usr/local/sdkman/candidates/java/21.0.2-ms/lib"/>
<property name="sun.java.command" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter5972284328267880397.jar /workspaces/cse3310_sp24_group_26/target/surefire 2024-04-13T06-51-21_617-jvmRun1 surefire14162063764419139343tmp surefire_017489560524494552720tmp"/>
<property name="sun.java.command" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter14039090773852145503.jar /workspaces/cse3310_sp24_group_26/target/surefire 2024-04-13T19-37-40_596-jvmRun1 surefire17408383254445461201tmp surefire_01577500218245761020tmp"/>
<property name="jdk.debug" value="release"/>
<property name="surefire.test.class.path" value="/workspaces/cse3310_sp24_group_26/target/test-classes:/workspaces/cse3310_sp24_group_26/target/classes:/home/codespace/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/codespace/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/codespace/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/home/codespace/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/home/codespace/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/home/codespace/.m2/repository/org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.jar:"/>
<property name="sun.cpu.endian" value="little"/>
Expand All @@ -26,7 +26,7 @@
<property name="line.separator" value="&#10;"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="surefire.real.class.path" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter5972284328267880397.jar"/>
<property name="surefire.real.class.path" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter14039090773852145503.jar"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
<property name="java.runtime.version" value="21.0.2+13-LTS"/>
<property name="user.name" value="codespace"/>
Expand All @@ -53,5 +53,5 @@
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="java.class.version" value="65.0"/>
</properties>
<testcase name="shouldAnswerWithTrue" classname="com.cse3310.AppTest" time="0.011"/>
<testcase name="shouldAnswerWithTrue" classname="com.cse3310.AppTest" time="0.004"/>
</testsuite>
2 changes: 1 addition & 1 deletion target/surefire-reports/com.cse3310.AppTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: com.cse3310.AppTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.05 s - in com.cse3310.AppTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s - in com.cse3310.AppTest
Binary file modified target/test-classes/com/cse3310/AppTest.class
View file
Open in desktop
Binary file not shown.