Skip to content

Commit

Permalink
Merge branch 'main' into feature/improved-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
DOOduneye authored Feb 1, 2024
2 parents 264a94a + 1673ef0 commit d1dcb15
Show file tree
Hide file tree
Showing 42 changed files with 661 additions and 343 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/auto_assign_author.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Auto Assign Author

on:
pull_request:
types: [opened, ready_for_review, reopened]
types: [opened, reopened]

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

jobs:
auto-add-assignee:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/auto_request_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ name: Auto Request Review

on:
pull_request:
types: [opened, ready_for_review, reopened]
types: [opened, reopened]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
auto-request-review:
runs-on: ubuntu-latest
Expand Down
37 changes: 28 additions & 9 deletions .github/workflows/go.yml → .github/workflows/backend.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: Go
name: Backend

on:
push:
branches:
- main
paths:
- "backend/**"
- ".github/workflows/go.yml"
- ".github/workflows/backend.yml"
pull_request:
types: opened
paths:
- "backend/**"
- ".github/workflows/go.yml"
- ".github/workflows/backend.yml"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -27,9 +26,23 @@ jobs:
uses: actions/setup-go@v3
with:
go-version: "1.21"
- name: Enforce formatting
run: gofmt -l ./backend/ | grep ".go$" | xargs -r echo "Files not formatted:"

- name: Cache Go Modules
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Install gofumpt
run: go install mvdan.cc/gofumpt@latest
- name: Check code formatting
run: |
unformatted_files=$(gofumpt -l ./backend/)
if [ -n "$unformatted_files" ]; then
echo "Files not formatted:"
echo "$unformatted_files"
exit 1
fi
lint:
name: Lint
runs-on: ubuntu-latest
Expand All @@ -48,7 +61,6 @@ jobs:
echo "::error::Linting issues found"
exit 1
fi
test:
name: Test
runs-on: ubuntu-latest
Expand All @@ -68,6 +80,13 @@ jobs:
uses: actions/setup-go@v3
with:
go-version: "1.21"
- name: Cache Go Modules
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Install Dependencies
run: cd ./backend/ && go get ./...
- name: Increase max_connections in PostgreSQL
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/backend_codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Backend CodeQL

on:
push:
paths:
- "backend/**"
- ".github/workflows/backend_codeql.yml"
pull_request:
types: opened
paths:
- "backend/**"
- ".github/workflows/backend_codeql.yml"

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

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
security-events: write
strategy:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.21"
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: "go"
queries: security-and-quality
- name: Build
run: |
cd ./backend/ && go build -o backend src/main.go
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:go"
63 changes: 63 additions & 0 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: CLI

on:
push:
paths:
- "cli/**"
- ".github/workflows/cli.yml"
pull_request:
types: opened
paths:
- "cli/**"
- ".github/workflows/cli.yml"

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

jobs:
format:
name: Format
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.21"
- name: Cache Go Modules
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Install gofumpt
run: go install mvdan.cc/gofumpt@latest
- name: Check code formatting
run: |
unformatted_files=$(gofumpt -l ./cli/)
if [ -n "$unformatted_files" ]; then
echo "Files not formatted:"
echo "$unformatted_files"
exit 1
fi
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.21"
- name: Enforce linting
run: |
cd ./cli/ && lint_output=$(go vet ./...)
if [[ -n "$lint_output" ]]; then
echo "$lint_output"
echo "::error::Linting issues found"
exit 1
fi
44 changes: 44 additions & 0 deletions .github/workflows/cli_codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: CLI CodeQL

on:
push:
paths:
- "cli/**"
- ".github/workflows/cli_codeql.yml"
pull_request:
types: opened
paths:
- "cli/**"
- ".github/workflows/cli_codeql.yml"

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

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
security-events: write
strategy:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.21"
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: "go"
queries: security-and-quality
- name: Build
run: |
cd ./cli/ && go build -o cli main.go
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:go"
99 changes: 0 additions & 99 deletions .github/workflows/codeql.yml

This file was deleted.

41 changes: 41 additions & 0 deletions .github/workflows/mobile_codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Mobile CodeQL

on:
push:
paths:
- "frontend/sac-mobile/**"
- ".github/workflows/mobile_codeql.yml"
pull_request:
types: opened
paths:
- "frontend/sac-mobile/**"
- ".github/workflows/mobile_codeql.yml"

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

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
security-events: write
strategy:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: "javascript-typescript"
queries: security-and-quality
- name: Autobuild
uses: github/codeql-action/autobuild@v3
with:
working-directory: frontend/sac-mobile
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:javascript-typescript"
Loading

0 comments on commit d1dcb15

Please sign in to comment.