diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db732d0..2c5a81c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,25 +23,25 @@ jobs: - run: npm --prefix webapp test -- --coverage - run: npm --prefix questionservice test -- --coverage - name: Analyze with SonarCloud - uses: sonarsource/sonarcloud-github-action@master - env: + uses: sonarsource/sonarcloud-github-action@master + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} -# e2e-tests: -# needs: [unit-tests] -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/setup-node@v4 -# with: -# node-version: 20 -# - run: npm --prefix userservice/authservice install -# - run: npm --prefix userservice/userservice install -# - run: npm --prefix gatewayservice install -# - run: npm --prefix questionservice install -# - run: npm --prefix webapp install -# - run: npm --prefix webapp run build -# - run: npm --prefix webapp run test:e2e +# e2e-tests: +# needs: [unit-tests] +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# - uses: actions/setup-node@v4 +# with: +# node-version: 20 +# - run: npm --prefix userservice/authservice install +# - run: npm --prefix userservice/userservice install +# - run: npm --prefix gatewayservice install +# - run: npm --prefix questionservice install +# - run: npm --prefix webapp install +# - run: npm --prefix webapp run build +# - run: npm --prefix webapp run test:e2e docker-push-webapp: name: Push webapp Docker Image to GitHub Packages runs-on: ubuntu-latest @@ -134,44 +134,6 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io workdir: questionservice - docker-push-grafana: - name: Push grafana service Docker Image to GitHub Packages - runs-on: ubuntu-latest - permissions: - contents: read - packages: write -# needs: [ e2e-tests ] - steps: - - uses: actions/checkout@v4 - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@v5 - with: - name: arquisoft/wiq_es05a/grafana - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io - workdir: monitoring/grafana - env: - GF_SECURITY_ADMIN_USER: ${{ secrets.GF_SECURITY_ADMIN_USER }} - GF_SECURITY_ADMIN_PASSWORD: ${{ secrets.GF_SECURITY_ADMIN_PASSWORD }} - GF_SERVER_SERVE_FROM_SUB_PATH: false - docker-push-prometheus: - name: Push prometheus service Docker Image to GitHub Packages - runs-on: ubuntu-latest - permissions: - contents: read - packages: write -# needs: [ e2e-tests ] - steps: - - uses: actions/checkout@v4 - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@v5 - with: - name: arquisoft/wiq_es05a/prometheus - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io - workdir: monitoring/prometheus deploy: name: Deploy over SSH runs-on: ubuntu-latest @@ -181,8 +143,6 @@ jobs: - docker-push-gatewayservice - docker-push-questionservice - docker-push-webapp - - docker-push-grafana - - docker-push-prometheus steps: - name: Deploy over SSH uses: fifsky/ssh-action@master @@ -194,4 +154,4 @@ jobs: wget https://raw.githubusercontent.com/arquisoft/wiq_es05a/master/docker-compose.yml -O docker-compose.yml wget https://raw.githubusercontent.com/arquisoft/wiq_es05a/master/.env -O .env docker compose --profile prod down - docker compose --profile prod up -d --pull always + docker compose --profile prod up -d --pull always \ No newline at end of file