Skip to content

Commit

Permalink
Merge branch 'main' into pr-rework
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Krug <[email protected]>
  • Loading branch information
michikrug committed Jan 10, 2024
2 parents fd24234 + bcbae0f commit f243212
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 363 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
run: npm run test-ci

- name: Upload Test Coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage
path: coverage/
Expand All @@ -76,12 +76,12 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

deployment:
if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release'
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
credentials_json: ${{ secrets.GCP_SA_KEY }}

- name: Deploy to Google Cloud Functions
uses: google-github-actions/deploy-cloud-functions@v1.0.1
uses: google-github-actions/deploy-cloud-functions@v2.0.0
with:
name: ${{ github.event_name == 'release' && 'openhabGoogleAssistant' || 'openhabGoogleAssistant_test' }}
runtime: nodejs18
Expand Down
Loading

0 comments on commit f243212

Please sign in to comment.