Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
fallenbagel
2023-11-06 17:41:40 +05:00
7 changed files with 19 additions and 17 deletions

View File

@@ -12,8 +12,8 @@ jobs:
test: test:
name: Lint & Test Build name: Lint & Test Build
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
container: node:20.9-alpine container: node:18.18-alpine
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
build_and_push: build_and_push:
name: Build & Publish Docker Images name: Build & Publish Docker Images
if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]') if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@@ -66,7 +66,7 @@ jobs:
name: Send Discord Notification name: Send Discord Notification
needs: build_and_push needs: build_and_push
if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]') if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Get Build Job Status - name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3 uses: technote-space/workflow-conclusion-action@v3

View File

@@ -8,7 +8,7 @@ on:
jobs: jobs:
build_and_push: build_and_push:
name: Build & Publish Docker Preview Images name: Build & Publish Docker Preview Images
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3

View File

@@ -5,7 +5,7 @@ on: workflow_dispatch
jobs: jobs:
semantic-release: semantic-release:
name: Tag and release latest version name: Tag and release latest version
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
env: env:
HUSKY: 0 HUSKY: 0
steps: steps:
@@ -38,7 +38,7 @@ jobs:
build-snap: build-snap:
name: Build Snap Package (${{ matrix.architecture }}) name: Build Snap Package (${{ matrix.architecture }})
needs: semantic-release needs: semantic-release
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -94,7 +94,7 @@ jobs:
name: Send Discord Notification name: Send Discord Notification
needs: semantic-release needs: semantic-release
if: always() if: always()
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Get Build Job Status - name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3 uses: technote-space/workflow-conclusion-action@v3

View File

@@ -8,7 +8,7 @@ on:
jobs: jobs:
jobs: jobs:
name: Job Check name: Job Check
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
if: "!contains(github.event.head_commit.message, '[skip ci]')" if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps: steps:
- name: Cancel Previous Runs - name: Cancel Previous Runs
@@ -19,7 +19,7 @@ jobs:
build-snap: build-snap:
name: Build Snap Package (${{ matrix.architecture }}) name: Build Snap Package (${{ matrix.architecture }})
needs: jobs needs: jobs
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -69,7 +69,7 @@ jobs:
name: Send Discord Notification name: Send Discord Notification
needs: build-snap needs: build-snap
if: always() && !contains(github.event.head_commit.message, '[skip ci]') if: always() && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Get Build Job Status - name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3 uses: technote-space/workflow-conclusion-action@v3

View File

@@ -1,4 +1,4 @@
FROM node:20.9-alpine AS BUILD_IMAGE FROM node:18.18-alpine AS BUILD_IMAGE
WORKDIR /app WORKDIR /app
@@ -8,7 +8,9 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
RUN \ RUN \
case "${TARGETPLATFORM}" in \ case "${TARGETPLATFORM}" in \
'linux/arm64' | 'linux/arm/v7') \ 'linux/arm64' | 'linux/arm/v7') \
apk add --no-cache python3 make g++ \ apk update && \
apk add --no-cache python3 make g++ gcc libc6-compat bash && \
yarn global add node-gyp \
;; \ ;; \
esac esac
@@ -32,7 +34,7 @@ RUN touch config/DOCKER
RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
FROM node:20.9-alpine FROM node:18.18-alpine
WORKDIR /app WORKDIR /app

View File

@@ -1,4 +1,4 @@
FROM node:20.9-alpine FROM node:18.18-alpine
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app

View File

@@ -17,9 +17,9 @@ architectures:
parts: parts:
jellyseerr: jellyseerr:
plugin: nodejs plugin: nodejs
nodejs-version: '20.9.0' nodejs-version: '18.18.2'
nodejs-package-manager: 'yarn' nodejs-package-manager: 'yarn'
nodejs-yarn-version: v1.22.17 nodejs-yarn-version: v1.22.19
build-packages: build-packages:
- git - git
- on arm64: - on arm64: