Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/client/typescript-es…
Browse files Browse the repository at this point in the history
…lint/eslint-plugin-5.59.2
  • Loading branch information
NicMcPhee authored Jan 29, 2024
2 parents 6f79071 + 220f17a commit 556e77c
Show file tree
Hide file tree
Showing 8 changed files with 932 additions and 386 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/client-angular.yaml
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
name: Client Angular
name: Client

on: [push]
on: [push, pull_request]

defaults:
run:
working-directory: ./client

jobs:
ng-test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v4
- name: Use Node.js 18

uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: 18
cache: 'npm'
cache-dependency-path: ./client/package-lock.json

- name: Install dependencies (npm ci)
run: npm ci
working-directory: ./client
env:
CYPRESS_INSTALL_BINARY: 0

- name: Test (npm run test)
run: npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
working-directory: ./client

ng-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Use Node.js 18
uses: actions/setup-node@v3

uses: actions/setup-node@v4
with:
node-version: '18'
node-version: 18
cache: 'npm'
cache-dependency-path: ./client/package-lock.json

- name: Install dependencies (npm ci)
run: npm ci
working-directory: ./client
env:
CYPRESS_INSTALL_BINARY: 0

- name: Lint (npm run lint)
run: npm run lint
working-directory: ./client
82 changes: 82 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
pull_request:
schedule:
- cron: '38 14 * * 6'

jobs:
analyze:
name: Analyze
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
# required for all workflows
security-events: write

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
language: [ 'java-kotlin', 'javascript-typescript' ]
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
13 changes: 7 additions & 6 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
name: End-to-End

on: [push]
on: [push, pull_request]

jobs:
ng-e2e:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v4

- name: Cache Gradle artifacts (downloaded JARs, the wrapper, and any downloaded JDKs)
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -21,14 +22,14 @@ jobs:
${{ runner.os }}-gradle-
- name: Use Node.js 18
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: 18
cache: 'npm'
cache-dependency-path: ./client/package-lock.json

- name: Run e2e tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
start: ${{ github.workspace }}/server/gradlew run -p ${{ github.workspace }}/server/
command: npm run e2e
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/ng-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: "Update Angular"
on: # when the action should run. Can also be a CRON or in response to external events. see https://git.io/JeBz1
schedule:
- cron: '0 5 1 * *'
workflow_dispatch:

jobs:
ngxUptodate:
runs-on: ubuntu-latest
steps:
- name: Updating ng dependencies # the magic happens here !
uses: fast-facts/[email protected]
with:
base-branch: main
project-path: ./client/
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-title: Update Angular Dependencies
pr-branch-prefix: ng-update-
11 changes: 6 additions & 5 deletions .github/workflows/server-gradle.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
name: Server Java
name: Server

on: [push]
on: [push, pull_request]

jobs:
gradle-build:
runs-on: ubuntu-latest

steps:
- name: Checkout the repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v4

- name: Cache Gradle artifacts (downloaded JARs, the wrapper, and any downloaded JDKs)
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand Down
Loading

0 comments on commit 556e77c

Please sign in to comment.