Skip to content

Commit

Permalink
Merge pull request #630 from Jocke4f/fix_workspace_build_warnings
Browse files Browse the repository at this point in the history
 Updates in workspace to solve errors and warnings
  • Loading branch information
josephdadams authored Jan 13, 2024
2 parents d78c257 + d9cea9a commit 1cce951
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: npm pack
- name: NPM Publish
if: startsWith(github.ref, 'refs/tags/v')
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v3
with:
token: ${{ secrets.NPM_ACCESS_TOKEN }}
## - uses: Saionaro/[email protected]
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
uses: docker/setup-buildx-action@master
- name: Get Docker meta
id: meta
uses: crazy-max/ghaction-docker-meta@v2
uses: docker/metadata-action@v5
with:
images: josephdadams/tallyarbiter
tags: |
Expand All @@ -66,7 +66,7 @@ jobs:
latest=false
- name: Login to DockerHub
if: startsWith(github.ref, 'refs/tags/v')
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -77,22 +77,22 @@ jobs:
echo SENTRY_DSN=${{ secrets.SENTRY_DSN }} >> .env
- name: Build and push
if: startsWith(github.ref, 'refs/tags/v') != true
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- name: Build and push (multiarch)
if: startsWith(github.ref, 'refs/tags/v')
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6
platforms: linux/amd64,linux/arm64,linux/s390x,linux/arm/v7,linux/arm/v6

build_desktop:
name: Build Desktop on ${{ matrix.os }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ jobs:

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

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

- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 14

- name: Install dependencies
run: npm i -f

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

analyze_docker:
name: Analyze Docker
Expand All @@ -56,10 +56,10 @@ jobs:

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

- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -84,6 +84,6 @@ jobs:
vuln-type: 'os'

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: 'trivy-results.sarif'

0 comments on commit 1cce951

Please sign in to comment.