Skip to content

Commit

Permalink
Merge pull request #159 from Arquisoft/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Alberto-Guerra authored Apr 10, 2024
2 parents f12d157 + 73f9da3 commit 49c69a5
Show file tree
Hide file tree
Showing 150 changed files with 30,711 additions and 3,471 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ jobs:

- run: npm --prefix gatewayservice ci
- run: npm --prefix webapp ci
- run: npm --prefix authservice ci
- run: npm --prefix userservice ci
- run: dotnet build ./wikidata_service/WikidataService.csproj
- run: npm --prefix wikidataservice ci
- run: npm --prefix users ci

- run: npm --prefix gatewayservice test -- --coverage
- run: npm --prefix webapp test -- --coverage
- run: npm --prefix wikidataservice test -- --coverage
- run: npm --prefix users test -- --coverage
- name: Analyze with SonarCloud
uses: sonarsource/sonarcloud-github-action@master
env:
Expand Down
23 changes: 18 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,32 @@ jobs:
workdir: webapp
buildargs: |
API_URI
docker-push-api:
name: Push api Docker Image to GitHub Packages
docker-push-users:
name: Push users API Docker Image to GitHub Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: arquisoft/wiq_en3a/api
name: arquisoft/wiq_en3a/users
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: api
workdir: users
docker-push-wikidataservice:
name: Push wikidata API Docker Image to GitHub Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: arquisoft/wiq_en3a/wikidataservice
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: wikidataservice
docker-push-gatewayservice:
name: Push gateway service Docker Image to GitHub Packages
runs-on: ubuntu-latest
Expand All @@ -54,7 +67,7 @@ jobs:
deploy:
name: Deploy over SSH
runs-on: ubuntu-latest
needs: [docker-push-gatewayservice,docker-push-webapp, docker-push-api]
needs: [docker-push-gatewayservice,docker-push-webapp, docker-push-users, docker-push-wikidataservice]
steps:
- name: Deploy over SSH
uses: fifsky/ssh-action@master
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wiq_en3a&metric=coverage)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wiq_en3a)

# wiq_en3a
Thank you for checking out wiq_en3a! Below are some useful links to get started:

- **[Application](http://51.103.210.249:3000/)**: Click this link to start playing!

- **[Documentation](https://arquisoft.github.io/wiq_en3a/)**: Explore detailed documentation to learn more about the game and its features.

Feel free to explore the application and documentation, and don't hesitate to reach out if you have any questions or feedback. Enjoy playing wiq_en3a!

## Welcome to WIQ👩‍🎓👨‍🎓

Expand Down
54 changes: 0 additions & 54 deletions api/authservice/auth-service.test.js

This file was deleted.

36 changes: 0 additions & 36 deletions api/userservice/user-service.test.js

This file was deleted.

Empty file.
102 changes: 0 additions & 102 deletions api/wikidataservice/package-lock.json

This file was deleted.

5 changes: 0 additions & 5 deletions api/wikidataservice/package.json

This file was deleted.

Loading

0 comments on commit 49c69a5

Please sign in to comment.