Skip to content

Commit

Permalink
move ts workflows to ci workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
dejanzele committed Jun 28, 2023
1 parent 397b126 commit dcea1da
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 50 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@ name: CI

on:
push:
branches-ignore:
- gh-pages
pull_request:
branches-ignore:
- gh-pages
schedule:
# Run daily at 01:34, so we get notified if CI is broken before a pull request
# is submitted.
- cron: "34 1 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read
pull-requests: read
Expand All @@ -33,3 +41,4 @@ jobs:
steps:
- run: |
echo "All required checks done"
24 changes: 23 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,29 @@ permissions:
pull-requests: read

jobs:
lint-go:
ts-lint:
# TODO(JayF): Determine what nodejs versions we target, and setup matrix-based testing similar to what we do for go
name: Lint TypeScript
runs-on: ubuntu-22.04

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

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16.14.2
cache: yarn
cache-dependency-path: ./internal/lookout/ui/yarn.lock

- name: Check TypeScript formatting
run: |
yarn install --frozen-lockfile && yarn run fmt || exit 1
exit $(git status -s -uno | wc -l)
working-directory: ./internal/lookout/ui

go-lint:
name: Lint Go
runs-on: ubuntu-22.04

Expand Down
24 changes: 22 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,27 @@ permissions:
checks: write

jobs:
unit-tests:
ts-unit-tests:
name: TypeScript Unit Tests
runs-on: ubuntu-22.04

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

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16.14.2
cache: yarn
cache-dependency-path: ./internal/lookout/ui/yarn.lock

- name: Run Unit Tests
run: |
yarn install --frozen-lockfile && yarn run openapi && CI=true yarn run test
working-directory: ./internal/lookout/ui

go-unit-tests:
name: Unit Tests
runs-on: ubuntu-22.04

Expand Down Expand Up @@ -56,7 +76,7 @@ jobs:
name: codecov-armada-unit-tests
verbose: true

integration-tests:
go-integration-tests:
name: Integration Tests
runs-on: ubuntu-22.04

Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/ts.yml

This file was deleted.

0 comments on commit dcea1da

Please sign in to comment.