diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..436ebf9 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,58 @@ +name: Build and Deploy Auction App + +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Java 17 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + + - name: Build with Maven + run: mvn -B clean package + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: auction + path: target/*.jar + + deploy: + needs: build + runs-on: ubuntu-latest + + steps: + - name: Download artifact + uses: actions/download-artifact@v4 + with: + name: auction + + - name: Copy to server + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.SERVER_IP }} + username: ${{ secrets.SERVER_USER }} + key: ${{ secrets.SERVER_SSH_KEY }} + source: "*.jar" + target: "/opt/auction/app.jar" + + - name: Restart service + uses: appleboy/ssh-action@v0.1.7 + with: + host: ${{ secrets.SERVER_IP }} + username: ${{ secrets.SERVER_USER }} + key: ${{ secrets.SERVER_SSH_KEY }} + script: | + sudo systemctl restart auction + echo "Deployment complete" diff --git a/.gitignore b/.gitignore index 27caa23..c837ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,4 @@ bin/ ### Mac OS ### .DS_Store -NUL \ No newline at end of file +NUL diff --git a/README.md b/README.md index e7f1ffa..c19738c 100644 --- a/README.md +++ b/README.md @@ -231,3 +231,5 @@ Kavel 12345 sluit binnen 5 min. ## License This is example code for educational purposes. + + diff --git a/pom.xml b/pom.xml index b4a8a2f..a006be5 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,18 @@ 11 - + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + + com.auction.Main + + + + org.apache.maven.plugins @@ -78,7 +89,7 @@ - com.auction.scraper.TroostwijkScraper + com.auction.TroostwijkScraper diff --git a/src/main/java/com/auction/scraper/Main.java b/src/main/java/com/auction/Main.java similarity index 87% rename from src/main/java/com/auction/scraper/Main.java rename to src/main/java/com/auction/Main.java index 59abbc3..5b3aa08 100644 --- a/src/main/java/com/auction/scraper/Main.java +++ b/src/main/java/com/auction/Main.java @@ -1,4 +1,4 @@ -package com.auction.scraper; +package com.auction; public class Main { public static void main(String[] args) { diff --git a/src/main/java/com/auction/scraper/TroostwijkScraper.java b/src/main/java/com/auction/TroostwijkScraper.java similarity index 99% rename from src/main/java/com/auction/scraper/TroostwijkScraper.java rename to src/main/java/com/auction/TroostwijkScraper.java index c3d0098..0456e66 100644 --- a/src/main/java/com/auction/scraper/TroostwijkScraper.java +++ b/src/main/java/com/auction/TroostwijkScraper.java @@ -1,4 +1,4 @@ -package com.auction.scraper; +package com.auction; /* * TroostwijkScraper @@ -47,7 +47,6 @@ import java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/.github/workflows/deploy.yml b/src/main/java/com/auction/deploy.yml similarity index 100% rename from .github/workflows/deploy.yml rename to src/main/java/com/auction/deploy.yml diff --git a/target/classes/com/auction/scraper/Main.class b/target/classes/com/auction/scraper/Main.class deleted file mode 100644 index d400324..0000000 Binary files a/target/classes/com/auction/scraper/Main.class and /dev/null differ diff --git a/target/classes/com/auction/scraper/TroostwijkScraper$DatabaseService.class b/target/classes/com/auction/scraper/TroostwijkScraper$DatabaseService.class deleted file mode 100644 index 55d52d5..0000000 Binary files a/target/classes/com/auction/scraper/TroostwijkScraper$DatabaseService.class and /dev/null differ diff --git a/target/classes/com/auction/scraper/TroostwijkScraper$Lot.class b/target/classes/com/auction/scraper/TroostwijkScraper$Lot.class deleted file mode 100644 index 23d3787..0000000 Binary files a/target/classes/com/auction/scraper/TroostwijkScraper$Lot.class and /dev/null differ diff --git a/target/classes/com/auction/scraper/TroostwijkScraper$NotificationService$1.class b/target/classes/com/auction/scraper/TroostwijkScraper$NotificationService$1.class deleted file mode 100644 index 7539e9d..0000000 Binary files a/target/classes/com/auction/scraper/TroostwijkScraper$NotificationService$1.class and /dev/null differ diff --git a/target/classes/com/auction/scraper/TroostwijkScraper$NotificationService.class b/target/classes/com/auction/scraper/TroostwijkScraper$NotificationService.class deleted file mode 100644 index f1950ab..0000000 Binary files a/target/classes/com/auction/scraper/TroostwijkScraper$NotificationService.class and /dev/null differ diff --git a/target/classes/com/auction/scraper/TroostwijkScraper$ObjectDetectionService.class b/target/classes/com/auction/scraper/TroostwijkScraper$ObjectDetectionService.class deleted file mode 100644 index a123796..0000000 Binary files a/target/classes/com/auction/scraper/TroostwijkScraper$ObjectDetectionService.class and /dev/null differ diff --git a/target/classes/com/auction/scraper/TroostwijkScraper.class b/target/classes/com/auction/scraper/TroostwijkScraper.class deleted file mode 100644 index 479f691..0000000 Binary files a/target/classes/com/auction/scraper/TroostwijkScraper.class and /dev/null differ