Skip to content

Commit 96390fd

Browse files
authored
merge dev to main (v2.0.2) (#1395)
2 parents 3291c6e + bb775ef commit 96390fd

File tree

23 files changed

+172
-156
lines changed

23 files changed

+172
-156
lines changed

.github/workflows/codeql.yml

Lines changed: 60 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,92 @@
1-
name: Security - CodeQL
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: 'CodeQL'
213

314
on:
15+
push:
16+
branches: ['main', 'dev', 'release/*']
417
pull_request:
5-
branches:
6-
- main
7-
- dev
8-
- release/*
18+
branches: ['main', 'dev', 'release/*']
919
schedule:
10-
- cron: '0 0 * * 1'
11-
12-
permissions:
13-
contents: read
20+
- cron: '25 0 * * 6'
1421

1522
jobs:
1623
analyze:
24+
name: Analyze (${{ matrix.language }})
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners (GitHub.com only)
29+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
1732
permissions:
33+
# required for all workflows
34+
security-events: write
35+
36+
# required to fetch internal or private CodeQL packs
37+
packages: read
38+
39+
# only required for workflows in private repositories
1840
actions: read
1941
contents: read
20-
security-events: write
21-
name: Analyze
22-
runs-on: ubuntu-latest
2342

2443
strategy:
2544
fail-fast: false
2645
matrix:
27-
language: ['javascript', 'typescript']
28-
# CodeQL supports [ $supported-codeql-languages ]
29-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
30-
46+
include:
47+
- language: javascript-typescript
48+
build-mode: none
49+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
50+
# Use `c-cpp` to analyze code written in C, C++ or both
51+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
52+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
53+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
54+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
55+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
56+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
3157
steps:
32-
- name: Harden Runner
33-
uses: step-security/[email protected]
34-
with:
35-
egress-policy: audit
36-
3758
- name: Checkout repository
38-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
59+
uses: actions/checkout@v4
3960

4061
# Initializes the CodeQL tools for scanning.
4162
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v2.22.12
63+
uses: github/codeql-action/init@v3
4364
with:
4465
languages: ${{ matrix.language }}
66+
build-mode: ${{ matrix.build-mode }}
4567
# If you wish to specify custom queries, you can do so here or in a config file.
4668
# By default, queries listed here will override any specified in a config file.
4769
# Prefix the list here with "+" to use these queries and those in the config file.
4870

49-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
50-
# If this step fails, then you should remove it and run the build manually (see below)
51-
- name: Autobuild
52-
uses: github/codeql-action/[email protected]
71+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
72+
# queries: security-extended,security-and-quality
5373

74+
# If the analyze step fails for one of the languages you are analyzing with
75+
# "We were unable to automatically build your code", modify the matrix above
76+
# to set the build mode to "manual" for that language. Then modify this step
77+
# to build your code.
5478
# ℹ️ Command-line programs to run using the OS shell.
5579
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
56-
57-
# If the Autobuild fails above, remove it and uncomment the following three lines.
58-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
59-
60-
# - run: |
61-
# echo "Run, Build Application using script"
62-
# ./location_of_script_within_repo/buildscript.sh
80+
- if: matrix.build-mode == 'manual'
81+
run: |
82+
echo 'If you are using a "manual" build mode for one or more of the' \
83+
'languages you are analyzing, replace this with the commands to build' \
84+
'your code, for example:'
85+
echo ' make bootstrap'
86+
echo ' make release'
87+
exit 1
6388
6489
- name: Perform CodeQL Analysis
65-
uses: github/codeql-action/analyze@v2.22.12
90+
uses: github/codeql-action/analyze@v3
6691
with:
6792
category: '/language:${{matrix.language}}'

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ The following diagram gives a high-level architecture overview of ZenStack.
171171
- [SvelteKit](https://zenstack.dev/docs/reference/server-adapters/sveltekit)
172172
- [Fastify](https://zenstack.dev/docs/reference/server-adapters/fastify)
173173
- [ExpressJS](https://zenstack.dev/docs/reference/server-adapters/express)
174+
- [NestJS](https://zenstack.dev/docs/reference/server-adapters/nestjs)
174175
- 🙋🏻 [Request for an adapter](https://discord.gg/Ykhr738dUe)
175176

176177
### Prisma schema extensions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r build",

packages/ide/jetbrains/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "dev.zenstack"
12-
version = "2.0.1"
12+
version = "2.0.2"
1313

1414
repositories {
1515
mavenCentral()

packages/ide/jetbrains/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jetbrains",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"displayName": "ZenStack JetBrains IDE Plugin",
55
"description": "ZenStack JetBrains IDE plugin",
66
"homepage": "https://zenstack.dev",

packages/language/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/language",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

packages/misc/redwood/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/redwood",
33
"displayName": "ZenStack RedwoodJS Integration",
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
66
"repository": {
77
"type": "git",

packages/plugins/openapi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/openapi",
33
"displayName": "ZenStack Plugin and Runtime for OpenAPI",
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"description": "ZenStack plugin and runtime supporting OpenAPI",
66
"main": "index.js",
77
"repository": {

packages/plugins/swr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/swr",
33
"displayName": "ZenStack plugin for generating SWR hooks",
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"description": "ZenStack plugin for generating SWR hooks",
66
"main": "index.js",
77
"repository": {

packages/plugins/tanstack-query/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/tanstack-query",
33
"displayName": "ZenStack plugin for generating tanstack-query hooks",
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"description": "ZenStack plugin for generating tanstack-query hooks",
66
"main": "index.js",
77
"exports": {

0 commit comments

Comments
 (0)