diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..0595c13e9 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,26 @@ +version: 2 +updates: + - package-ecosystem: "npm" + directory: "/frontend" + schedule: + interval: "daily" + labels: + - "dependencies" + open-pull-requests-limit: 5 + reviewers: + - "NielsPraet" + - "Mikxox" + - "tvhimme" + + - package-ecosystem: "maven" + directory: "/backend" + schedule: + interval: "daily" + labels: + - "dependencies" + open-pull-requests-limit: 5 + reviewers: + - "MaartenS11" + - "TomAlard" + - "NinjaJay" + - "lars-vc" diff --git a/.github/workflows/all_tests.yml b/.github/workflows/all_tests.yml index b24040982..590533bbc 100644 --- a/.github/workflows/all_tests.yml +++ b/.github/workflows/all_tests.yml @@ -14,39 +14,25 @@ on: jobs: container-job: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: mikxox/maven-test-action:latest options: --rm - env: - GITHUB_WORKSPACE: /home/selab2/actions-runner/workspace steps: - uses: actions/checkout@v2 - with: - path: 'temppath' - name: Test with Maven # -B: run in non-interactive (batch) mode - run: | - cd /__w/OSOC-1/OSOC-1/temppath/backend - ./mvnw -B -DfailIfNoTests=false test --file pom.xml + run: ./mvnw -B -DfailIfNoTests=false test --file pom.xml + working-directory: ./backend - name: Upload coverage to Codecov uses: codecov/codecov-action@v2 with: token: ${{ secrets.CODECOV_TOKEN }} - directory: /__w/OSOC-1/OSOC-1/temppath - working-directory: /__w/OSOC-1/OSOC-1/temppath - root_dir: /__w/OSOC-1/OSOC-1/temppath fail_ci_if_error: true - files: /__w/OSOC-1/OSOC-1/temppath/backend/target/site/jacoco/jacoco.xml + files: /__w/OSOC-1/OSOC-1/backend/target/site/jacoco/jacoco.xml flags: all_tests name: codecov-umbrella verbose: true - - - name: remove temppath - if: always() - run: | - cd /__w/OSOC-1/OSOC-1/ - sudo rm -rf temppath diff --git a/.github/workflows/backend-linting.yml b/.github/workflows/backend-linting.yml index 525b648b8..36ca12403 100644 --- a/.github/workflows/backend-linting.yml +++ b/.github/workflows/backend-linting.yml @@ -7,19 +7,16 @@ on: jobs: ktlint: name: Check Code Quality - runs-on: self-hosted + runs-on: ubuntu-latest container: image: mikxox/maven-test-action:latest options: --rm - env: - GITHUB_WORKSPACE: /home/selab2/actions-runner/workspace steps: - name: Clone repo uses: actions/checkout@v2 with: fetch-depth: 1 - path: 'temppath' - name: install reviewdog run: | @@ -29,13 +26,8 @@ jobs: env: REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - cd /__w/OSOC-1/OSOC-1/temppath/backend curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.44.0/ktlint chmod a+x ktlint ./ktlint --reporter=checkstyle | reviewdog -f=checkstyle -name="ktlint" -reporter="github-pr-check" -level="error" -filter-mode="nofilter" -fail-on-error="false" + working-directory: ./backend - - name: remove temppath - if: always() - run: | - cd /__w/OSOC-1/OSOC-1/ - sudo rm -rf temppath diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index c52b011d9..ce8dfd5ad 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -3,23 +3,19 @@ on: [push] jobs: commitlint: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: mikxox/maven-test-action:latest options: --rm - env: - GITHUB_WORKSPACE: /home/selab2/actions-runner/workspace steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - path: 'temppath' - name: Validate all commits from PR shell: bash run: | - cd /__w/OSOC-1/OSOC-1/temppath STATUS="$(git log -1 --pretty=format:"%s" | npx commitlint)" echo -E ::notice title=commitmessage::$(git log -1 --pretty=format:"%s" | npx commitlint --verbose | sed 's/%/%25/g' | sed 's/\n/%0A/g' | sed 's/\r/%0D/g') @@ -27,12 +23,4 @@ jobs: shell: bash if: failure() run: | - cd /__w/OSOC-1/OSOC-1/temppath echo -E ::error title=commitmessage::$(git log -1 --pretty=format:"%s" | npx commitlint --verbose | sed 's/%/%25/g' | sed 's/\n/%0A/g' | sed 's/\r/%0D/g') - - - - name: remove temppath - if: always() - run: | - cd /__w/OSOC-1/OSOC-1/ - sudo rm -rf temppath \ No newline at end of file diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 39a9e06f9..110862063 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -13,7 +13,7 @@ on: jobs: container-job: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: mikxox/maven-test-action:latest options: --rm @@ -22,14 +22,13 @@ jobs: with: ref: ${{ github.head_ref }} fetch-depth: 0 - path: 'temppath' - name: install yarn and dependencies run: | - cd /__w/OSOC-1/OSOC-1/temppath/frontend npm install --global yarn npm install --global eslint-formatter-rdjson yarn install --frozen-lockfile + working-directory: ./frontend - name: install reviewdog run: | @@ -39,16 +38,15 @@ jobs: env: REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - cd /__w/OSOC-1/OSOC-1/temppath/frontend - /__w/OSOC-1/OSOC-1/temppath/frontend/node_modules/.bin/eslint -f=rdjson . | reviewdog -f=rdjson -name="eslint" -reporter="github-pr-check" -level="error" -filter-mode="nofilter" -fail-on-error="true" + node_modules/.bin/eslint -f=rdjson . | reviewdog -f=rdjson -name="eslint" -reporter="github-pr-check" -level="error" -filter-mode="nofilter" -fail-on-error="true" + working-directory: ./frontend - name: prettier with reviewdog if: always() env: REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - cd /__w/OSOC-1/OSOC-1/temppath/frontend - /__w/OSOC-1/OSOC-1/temppath/frontend/node_modules/.bin/prettier --check --config /__w/OSOC-1/OSOC-1/temppath/frontend/prettier.config.js --ignore-path /__w/OSOC-1/OSOC-1/temppath/frontend/.prettierignore . 2>&1 | sed --regexp-extended 's/(\[warn\].*)$/\1 File is not properly formatted./' \ + node_modules/.bin/prettier --check --config /__w/OSOC-1/OSOC-1/frontend/prettier.config.js --ignore-path /__w/OSOC-1/OSOC-1/frontend/.prettierignore . 2>&1 | sed --regexp-extended 's/(\[warn\].*)$/\1 File is not properly formatted./' \ | reviewdog \ -efm="%-G[warn] Code style issues found in the above file(s). Forgot to run Prettier%. File is not properly formatted." \ -efm="[%tarn] %f %m" \ @@ -61,9 +59,4 @@ jobs: -filter-mode="nofilter" \ -fail-on-error="true" \ -level="error" - - - name: remove temppath - if: always() - run: | - cd /__w/OSOC-1/OSOC-1 - sudo rm -rf temppath \ No newline at end of file + working-directory: ./frontend diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 930cd8479..99a71d37e 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -19,26 +19,15 @@ on: jobs: container-job: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: mikxox/maven-test-action:latest options: --rm - env: - GITHUB_WORKSPACE: /home/selab2/actions-runner/workspace steps: - uses: actions/checkout@v2 - with: - path: 'temppath' - name: Test with Maven # -B: run in non-interactive (batch) mode - run: | - cd /__w/OSOC-1/OSOC-1/temppath/backend - ./mvnw -B -Dtest="unittests.**" -DfailIfNoTests=false test --file pom.xml - - - name: remove temppath - if: always() - run: | - cd /__w/OSOC-1/OSOC-1/ - sudo rm -rf temppath + run: ./mvnw -B -Dtest="unittests.**" -DfailIfNoTests=false test --file pom.xml + working-directory: ./backend diff --git a/backend/pom.xml b/backend/pom.xml index ae904f27b..fd85adf0e 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.7 be.osoc.team1 @@ -15,8 +15,8 @@ Backend for osoc selection tool 17 - 1.6.10 - 1.6.10 + 1.6.21 + 1.6.21 @@ -88,18 +88,18 @@ org.springframework.boot spring-boot-starter-security - 2.6.3 + 2.6.7 org.springframework.security spring-security-test - 5.6.2 + 5.6.3 test com.auth0 java-jwt - 3.18.3 + 3.19.2 @@ -158,7 +158,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.8 XML,HTML @@ -180,7 +180,7 @@