Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/minor-production-dep…
Browse files Browse the repository at this point in the history
…s-1db12ca47f
  • Loading branch information
gratcliff authored Jul 26, 2024
2 parents 2056df5 + bc375b2 commit 878fe99
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
config-file: ./.github/codeql/config.yml
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
21 changes: 10 additions & 11 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16

- run: npm ci --ignore-scripts
- run: make test-metrics-ruby-rails
- run: make test-webhooks-ruby-rails
- run: npm ci --ignore-scripts
- run: make test-metrics-ruby-rails
- run: make test-webhooks-ruby-rails

- name: Cleanup
if: always()
run: docker-compose down
- name: Cleanup
if: always()
run: docker-compose down

build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -55,7 +55,6 @@ jobs:
run: |
make install
gem install rack ${{ matrix.rack-version }}
bundle update
- name: Run linter
run: make lint
Expand Down

0 comments on commit 878fe99

Please sign in to comment.