Skip to content

Commit

Permalink
Merge branch 'develop' into feat/add-spoolman
Browse files Browse the repository at this point in the history
  • Loading branch information
meteyou committed Oct 3, 2023
2 parents 5a90fae + 79a5f9a commit b076fb1
Show file tree
Hide file tree
Showing 47 changed files with 3,347 additions and 10,549 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/auto-analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
auto-analyze:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -27,7 +27,7 @@ jobs:
uses: actions/setup-node@v3
if: contains(steps.changed-file-package-json.outputs.modified_files, 'package.json')
with:
node-version: '16'
node-version: 20
cache: 'npm'

- uses: preactjs/compressed-size-action@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Fetch repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install node
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: 20

- name: Install dependencies
run: npm ci
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Copy output
run: cp ${{ github.workspace }}/dist/mainsail.zip mainsail-latest.zip

- uses: actions/upload-artifact@v2.2.4
- uses: actions/upload-artifact@v3
with:
name: mainsail-latest.zip
path: mainsail-latest.zip
2 changes: 1 addition & 1 deletion .github/workflows/build_size_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'analyze')
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: preactjs/compressed-size-action@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check_locale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
run: sudo apt install -y jq

- name: Fetch repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Install dependencies
run: npm ci
Expand All @@ -46,7 +46,7 @@ jobs:
echo "::set-output name=$file::|${file##*/}|${MISSING}|${UNUSED}|"
done
- name: Comment PR
uses: thollander/actions-comment-pull-request@v1
uses: thollander/actions-comment-pull-request@v2
with:
message: |
Language file analysis report:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Fetch repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Install dependencies
run: npm ci

- name: Run linters
uses: wearerequired/lint-action@v1
uses: wearerequired/lint-action@v2
with:
eslint: true
prettier: true
eslint_dir: src
eslint_extensions: ts,vue
eslint_extensions: ts,vue,json
2 changes: 1 addition & 1 deletion .github/workflows/label-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
action:
runs-on: ubuntu-latest
steps:
- uses: dessant/label-actions@v2
- uses: dessant/label-actions@v3
12 changes: 6 additions & 6 deletions .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@ jobs:

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

- name: Log in to the Container registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
type=edge,branch=develop
type=ref,event=tag
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build and push Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
push: ${{ github.event_name != 'pull_request' }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Clone develop repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.PAT }}
ref: 'develop'
Expand Down Expand Up @@ -53,15 +53,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Fetch repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'master'
fetch-depth: 0

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Install dependencies
run: npm ci
Expand All @@ -80,7 +80,7 @@ jobs:
echo "TAG_NAME=$(git describe --tags $(git rev-list --tags --max-count=1))" >> $GITHUB_OUTPUT
- name: Generate a changelog
uses: orhun/git-cliff-action@v1
uses: orhun/git-cliff-action@v2
id: generate-changelog
with:
config: ./cliff-release.toml
Expand All @@ -101,7 +101,7 @@ jobs:
run: cp ./remote/* ./dist/

- name: Upload to remote server
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
uses: SamKirkland/FTP-Deploy-Action@v4
with:
server: ${{ secrets.REMOTEHOST }}
username: ${{ secrets.REMOTEUSER }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
# container: cypress/browsers:node16.13.2-chrome97-ff96
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Install dependencies
run: npm ci
Expand Down
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"semi": false,
"printWidth": 120,
"bracketSameLine": true,
"trailingComma": "es5",
"htmlWhitespaceSensitivity": "ignore",
"overrides": [
{
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Builder stage, builds the application in node
#
FROM --platform=$BUILDPLATFORM node:18-alpine as builder
FROM --platform=$BUILDPLATFORM node:20-alpine as builder

RUN apk add zip

Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
Loading

0 comments on commit b076fb1

Please sign in to comment.