Skip to content

Commit

Permalink
Merge remote-tracking branch 'ArtalkJS/release/v2.8.4' into new
Browse files Browse the repository at this point in the history
  • Loading branch information
inkss committed Apr 7, 2024
2 parents 34b0ae0 + bcfe5cc commit b04773d
Show file tree
Hide file tree
Showing 62 changed files with 3,558 additions and 2,117 deletions.
10 changes: 5 additions & 5 deletions .circleci/conditional_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
node: circleci/node@5.0.3
node: circleci/node@5.2.0
codecov: codecov/[email protected]

executors:
Expand All @@ -10,10 +10,10 @@ executors:
- image: cimg/base:stable
node:
docker:
- image: 'cimg/node:18.19.0'
- image: 'cimg/node:20.12.1'
go:
docker:
- image: cimg/go:1.21.5
- image: cimg/go:1.22.1

parameters:
trigger-app:
Expand All @@ -38,12 +38,12 @@ jobs:
go version
- restore_cache:
keys:
- go-mod-1.21.5-{{ checksum "go.sum" }}
- go-mod-1.22.1-{{ checksum "go.sum" }}
- run:
name: Install Dependencies
command: go mod download
- save_cache:
key: go-mod-1.21.5-{{ checksum "go.sum" }}
key: go-mod-1.22.1-{{ checksum "go.sum" }}
paths:
- "~/go/pkg/mod"
- run:
Expand Down
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ workflows:
branches:
ignore:
- gh-pages
- /release\/.+/
- nightly
Loading

0 comments on commit b04773d

Please sign in to comment.