diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 372db6dcca..1e8ed7eadd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,19 +1,16 @@ # Lines starting with '#' are comments. - # Each line is a file pattern followed by one or more owners. # More details are here: https://help.github.com/articles/about-codeowners/ -# The '\*' pattern is global owners. +# The '*' pattern is global owners. # Order is important. The last matching pattern has the most precedence. - # The folders are ordered as follows: # In each subsection folders are ordered first by depth, then alphabetically. - # This should make it easy to add new rules without breaking existing ones. # Global: -- @ctrlc03 @kittybest @0xmad @samajammin @crisgarner +* @ctrlc03 @kittybest @0xmad @samajammin @crisgarner diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000000..244c423cbf --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,46 @@ +name: "CodeQL" + +on: + push: + branches: [dev] + pull_request: + branches: [dev] + schedule: + - cron: "0 0 * * *" + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-22.04 + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: ["javascript", "typeScript"] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/contracts-build.yml b/.github/workflows/contracts-build.yml index 2e11c06218..c31031d6a0 100644 --- a/.github/workflows/contracts-build.yml +++ b/.github/workflows/contracts-build.yml @@ -2,7 +2,7 @@ name: Contracts on: push: - branches: [master, dev] + branches: [dev] pull_request: concurrency: diff --git a/.github/workflows/core-build.yml b/.github/workflows/core-build.yml index e7731479c7..17423cba2c 100644 --- a/.github/workflows/core-build.yml +++ b/.github/workflows/core-build.yml @@ -2,7 +2,7 @@ name: Core on: push: - branches: [master, dev] + branches: [dev] pull_request: concurrency: diff --git a/.github/workflows/crypto-build.yml b/.github/workflows/crypto-build.yml index f91800eb53..f70b082b77 100644 --- a/.github/workflows/crypto-build.yml +++ b/.github/workflows/crypto-build.yml @@ -2,7 +2,7 @@ name: Crypto on: push: - branches: [master, dev] + branches: [dev] pull_request: concurrency: diff --git a/.github/workflows/domainobjs-build.yml b/.github/workflows/domainobjs-build.yml index 3b0a05ab98..3d3e426fdf 100644 --- a/.github/workflows/domainobjs-build.yml +++ b/.github/workflows/domainobjs-build.yml @@ -2,7 +2,7 @@ name: Domainobjs on: push: - branches: [master, dev] + branches: [dev] pull_request: concurrency: diff --git a/.prettierignore b/.prettierignore index 59c4bde85e..9881b7a8be 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,6 +7,7 @@ cache/ package-lock.json **/package-lock.json CHANGELOG.md +CODEOWNERS .eslintignore circuits/ts/verifier_groth16.sol website/.docusaurus/ diff --git a/website/versioned_docs/version-v1.x/versioning.md b/website/versioned_docs/version-v1.x/versioning.md index d6d9810d84..5806a09f39 100644 --- a/website/versioned_docs/version-v1.x/versioning.md +++ b/website/versioned_docs/version-v1.x/versioning.md @@ -37,10 +37,10 @@ Version number '1.2.3' is used here as an example. You should replace the versio git clone https://github.com/privacy-scaling-explorations/maci ``` -3. Switch to the `master` branch: +3. Switch to the `dev` branch: ``` -git checkout master +git checkout dev ``` 4. Install required dependencies: