diff --git a/.github/workflows/pr-builder.yml b/.github/workflows/pr-builder.yml index 1c2cca19960..1b0dd813284 100644 --- a/.github/workflows/pr-builder.yml +++ b/.github/workflows/pr-builder.yml @@ -1,16 +1,13 @@ -# This workflow will build PRs submitted to the master branch. - name: PR Builder on: pull_request: - types: [ opened, synchronize, labeled ] - branches: [ master ] + types: [opened, synchronize, labeled] + branches: [master] paths-ignore: - "**.md" - "LICENSE" -# Avoid running multiple builds for the same PR. concurrency: group: pr-builder-${{ github.ref }} cancel-in-progress: true @@ -19,14 +16,16 @@ env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - lint: - name: ⬣ ESLint (STATIC ANALYSIS) + build: + name: 🚧 PR Build if: ${{ github.event_name == 'pull_request' || github.event.label.name == 'trigger-pr-builder' }} runs-on: ubuntu-latest strategy: matrix: - node-version: [ lts/* ] - pnpm-version: [ 8.7.4 ] + node-version: [lts/*] + pnpm-version: [8.7.4] + maven-version: [3.8.6] + java-version: [11] steps: - name: ⬇️ Checkout id: checkout @@ -68,6 +67,20 @@ jobs: restore-keys: | ${{ runner.os }}-pnpm-store- + - name: ☕ Set up JDK 11 + id: jdk-setup + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java-version }} + distribution: "adopt" + cache: maven + + - name: 🦩 Set up Maven + uses: stCarolas/setup-maven@v4 + id: mvn-setup + with: + maven-version: ${{ matrix.maven-version }} + - name: 🧩 Install Dependencies id: install-dependencies run: pnpm install @@ -80,61 +93,8 @@ jobs: # Temporarily disable linting all files as it is failing intermittently. # - name: ⏳ Lint All Files - # id: lint-with-eslint # run: pnpm nx affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --plain --target=lint --parallel=3 - typecheck: - name: ʦ Typecheck (STATIC ANALYSIS) - if: ${{github.event.label.name == 'trigger-pr-builder' || github.event_name == 'pull_request'}} - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [ lts/* ] - pnpm-version: [ 8.7.4 ] - steps: - - name: ⬇️ Checkout - id: checkout - uses: actions/checkout@v2.3.3 - with: - # We need to fetch all branches and commits so that Nx affected has a base to compare against. - fetch-depth: 0 - - - name: 🟢 Setup node - id: setup-node - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - - name: 🐳 Set SHAs for Nx - id: set-shas - uses: nrwl/nx-set-shas@v3 - with: - main-branch-name: "master" - - - name: 🥡 Setup pnpm - uses: pnpm/action-setup@v2.1.0 - with: - version: ${{ matrix.pnpm-version }} - run_install: false - - - name: 🎈 Get pnpm store directory - id: get-pnpm-cache-dir - run: | - echo "::set-output name=pnpm_cache_dir::$(pnpm store path)" - - - name: 🔆 Cache pnpm modules - uses: actions/cache@v3 - id: pnpm-cache - with: - path: ${{ steps.get-pnpm-cache-dir.outputs.pnpm_cache_dir }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: 🧩 Install Dependencies - id: install-dependencies - run: pnpm install - - name: 👷 Build Re-usable Modules id: build-reusable-modules run: pnpm build:modules @@ -142,53 +102,6 @@ jobs: - name: ☄️ Check Type Errors run: pnpm nx affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --target=typecheck --parallel=3 - test: - name: 👾 Unit Test (TESTING) - needs: [ typecheck ] - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [ lts/* ] - pnpm-version: [ 8.7.4 ] - steps: - - name: ⬇️ Checkout - id: checkout - uses: actions/checkout@v2.3.3 - - - name: 🟢 Setup node - id: setup-node - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - - name: 🥡 Setup pnpm - uses: pnpm/action-setup@v2.1.0 - with: - version: ${{ matrix.pnpm-version }} - run_install: false - - - name: 🎈 Get pnpm store directory - id: get-pnpm-cache-dir - run: | - echo "::set-output name=pnpm_cache_dir::$(pnpm store path)" - - - name: 🔆 Cache pnpm modules - uses: actions/cache@v3 - id: pnpm-cache - with: - path: ${{ steps.get-pnpm-cache-dir.outputs.pnpm_cache_dir }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: 🧩 Install Dependencies - id: install-dependencies - run: pnpm install - - - name: 👷 Build Re-usable Modules - id: build-reusable-modules - run: pnpm build:modules - - name: 🃏 Run Jest & Collect Coverage id: run-jest-test-and-coverage # TODO: Update the command to "test:unit:coverage" once the coverage command related issues @@ -204,65 +117,6 @@ jobs: pnpm nyc:text-summary-report pnpm nyc:text-report - build: - name: 🚧 Build - needs: [ test, typecheck ] - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [ lts/* ] - maven-version: [ 3.8.6 ] - java-version: [ 11 ] - pnpm-version: [ 8.7.4 ] - steps: - - name: ⬇️ Checkout - id: checkout - uses: actions/checkout@v2.3.3 - - - name: 🟢 Setup node - id: setup-node - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - - name: ☕ Set up JDK 11 - id: jdk-setup - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java-version }} - distribution: "adopt" - cache: maven - - - name: 🦩 Set up Maven - uses: stCarolas/setup-maven@v4 - id: mvn-setup - with: - maven-version: ${{ matrix.maven-version }} - - - name: 🥡 Setup pnpm - uses: pnpm/action-setup@v2.1.0 - with: - version: ${{ matrix.pnpm-version }} - run_install: false - - - name: 🎈 Get pnpm store directory - id: get-pnpm-cache-dir - run: | - echo "::set-output name=pnpm_cache_dir::$(pnpm store path)" - - - name: 🔆 Cache pnpm modules - uses: actions/cache@v3 - id: pnpm-cache - with: - path: ${{ steps.get-pnpm-cache-dir.outputs.pnpm_cache_dir }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: 🧩 Install Dependencies - id: install-dependencies - run: pnpm install - - name: 👷 PNPM Build id: build-with-pnpm run: pnpm build diff --git a/features/admin.extensions.v1/configs/models/administrator.ts b/features/admin.extensions.v1/configs/models/administrator.ts index 177ae13a58c..ce8130e5003 100644 --- a/features/admin.extensions.v1/configs/models/administrator.ts +++ b/features/admin.extensions.v1/configs/models/administrator.ts @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved. + * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). * * WSO2 LLC. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except