Skip to content
This repository has been archived by the owner on Dec 19, 2024. It is now read-only.

Update node dependencies #256

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/merge-conflict-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
name: Merge Conflict Labeler

on:
push:
branches:
- dev/0.15.0
pull_request_target:
types: [ synchronize ]
branches:
- dev/0.15.0
types: [synchronize]

jobs:
label:
name: 'Merge conflict labeling'
runs-on: ubuntu-latest
if: ${{ github.repository == 'tycrek/ass' }}
steps:
- uses: eps1lon/actions-label-merge-conflict@releases/2.x
- uses: eps1lon/actions-label-merge-conflict@v3
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
with:
dirtyLabel: 'merge conflict'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

# Set up Node 20
- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20

Expand All @@ -44,7 +44,7 @@ jobs:

# Upload archive as an artifact
- name: Upload archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARCHIVE_NAME }}
path: ${{ env.ARCHIVE_NAME }}.zip
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# - tycrek <t@tycrek.com> (https://tycrek.com/)
# - Zusier <zusier@pm.me> (https://github.com/Zusier)

FROM node:20.9.0-alpine
FROM node:20.12.2-alpine
WORKDIR /opt/ass-src/
COPY . ./
RUN npm i -g pnpm
Expand Down
Loading
Loading