diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 12c3298..7cc39ca 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,4 +1,4 @@ -name: Continuous Integration +name: CI on: push: @@ -7,36 +7,20 @@ on: pull_request: jobs: - Linting: + formatting: + name: Formatting + uses: sapphiredev/.github/.github/workflows/reusable-prettier.yml@main + + linting: name: Linting - runs-on: ubuntu-latest - steps: - - name: Checkout Project - uses: actions/checkout@v3 - - name: Use Node.js v20 - uses: actions/setup-node@v3 - with: - node-version: 20 - cache: yarn - registry-url: https://registry.yarnpkg.com/ - - name: Install Dependencies - run: yarn --immutable - - name: ESLint - run: yarn lint + uses: sapphiredev/.github/.github/workflows/reusable-lint.yml@main + + typecheck: + name: Typecheck + uses: sapphiredev/.github/.github/workflows/reusable-typecheck.yml@main - Typechecking: - name: Typechecking - runs-on: ubuntu-latest - steps: - - name: Checkout Project - uses: actions/checkout@v3 - - name: Use Node.js v20 - uses: actions/setup-node@v3 - with: - node-version: 20 - cache: yarn - registry-url: https://registry.yarnpkg.com/ - - name: Install Dependencies - run: yarn --immutable - - name: Typechecking - run: yarn test + sonar: + name: Sonar Analysis + uses: sapphiredev/.github/.github/workflows/reusable-sonar.yml@main + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/labelsync.yml b/.github/workflows/labelsync.yml index 97a27d9..e797336 100644 --- a/.github/workflows/labelsync.yml +++ b/.github/workflows/labelsync.yml @@ -7,17 +7,4 @@ on: jobs: label_sync: - name: Automatic Label Synchronization - runs-on: ubuntu-latest - steps: - - name: Checkout Project - uses: actions/checkout@v4 - with: - sparse-checkout: .github/labels.yml - sparse-checkout-cone-mode: false - repository: 'sapphiredev/.github' - - name: Run Label Sync - uses: crazy-max/ghaction-github-labeler@v5 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - yaml-file: .github/labels.yml + uses: sapphiredev/.github/.github/workflows/reusable-labelsync.yml@main diff --git a/.vscode/settings.json b/.vscode/settings.json index 6eda19a..bb6715a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,7 +23,7 @@ "tailwindCSS.experimental.configFile": "tailwind.config.ts", "prettier.documentSelectors": ["**/*.svg"], "sonarlint.connectedMode.project": { - "connectionId": "https-sonarqube-sapphirejs-dev", - "projectKey": "sapphiredev_resource-webhooks_e2cb9959-cd79-4b35-a323-e26dee4ce7d4" + "connectionId": "sapphiredev", + "projectKey": "sapphiredev_resource-webhooks" } } diff --git a/package.json b/package.json index d396cc2..249ac57 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "generate": "nuxt generate", "preview": "nuxt preview", "postinstall": "nuxt prepare", - "test": "nuxt typecheck", + "typecheck": "nuxt typecheck", "lint": "eslint . --fix", "format": "prettier --write .", "format:check": "prettier --check ."