From 5df341c5f1a9832f7f98865ad688b7ab1e8d23c1 Mon Sep 17 00:00:00 2001 From: abdulrahman305 Date: Wed, 15 May 2024 13:58:08 +0300 Subject: [PATCH 01/14] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..77f46eba8 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,30 @@ +# Universal Windows Platform +# Build a Universal Windows Platform project using Visual Studio. +# Add steps that test and distribute an app, save build artifacts, and more: +# https://aka.ms/yaml + +trigger: +- main + +pool: + vmImage: 'windows-latest' + +variables: + solution: '**/*.sln' + buildPlatform: 'x86|x64|ARM' + buildConfiguration: 'Release' + appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\' + +steps: +- task: NuGetToolInstaller@1 + +- task: NuGetCommand@2 + inputs: + restoreSolution: '$(solution)' + +- task: VSBuild@1 + inputs: + platform: 'x86' + solution: '$(solution)' + configuration: '$(buildConfiguration)' + msbuildArgs: '/p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload' From 1d0f25e8ba54c9e63003660d519cf5ab8629c26f Mon Sep 17 00:00:00 2001 From: abdulrahman305 Date: Fri, 21 Jun 2024 03:11:36 +0300 Subject: [PATCH 02/14] Create generator-generic-ossf-slsa3-publish.yml --- .../generator-generic-ossf-slsa3-publish.yml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .github/workflows/generator-generic-ossf-slsa3-publish.yml diff --git a/.github/workflows/generator-generic-ossf-slsa3-publish.yml b/.github/workflows/generator-generic-ossf-slsa3-publish.yml new file mode 100644 index 000000000..35c829b13 --- /dev/null +++ b/.github/workflows/generator-generic-ossf-slsa3-publish.yml @@ -0,0 +1,66 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# This workflow lets you generate SLSA provenance file for your project. +# The generation satisfies level 3 for the provenance requirements - see https://slsa.dev/spec/v0.1/requirements +# The project is an initiative of the OpenSSF (openssf.org) and is developed at +# https://github.com/slsa-framework/slsa-github-generator. +# The provenance file can be verified using https://github.com/slsa-framework/slsa-verifier. +# For more information about SLSA and how it improves the supply-chain, visit slsa.dev. + +name: SLSA generic generator +on: + workflow_dispatch: + release: + types: [created] + +jobs: + build: + runs-on: ubuntu-latest + outputs: + digests: ${{ steps.hash.outputs.digests }} + + steps: + - uses: actions/checkout@v4 + + # ======================================================== + # + # Step 1: Build your artifacts. + # + # ======================================================== + - name: Build artifacts + run: | + # These are some amazing artifacts. + echo "artifact1" > artifact1 + echo "artifact2" > artifact2 + + # ======================================================== + # + # Step 2: Add a step to generate the provenance subjects + # as shown below. Update the sha256 sum arguments + # to include all binaries that you generate + # provenance for. + # + # ======================================================== + - name: Generate subject for provenance + id: hash + run: | + set -euo pipefail + + # List the artifacts the provenance will refer to. + files=$(ls artifact*) + # Generate the subjects (base64 encoded). + echo "hashes=$(sha256sum $files | base64 -w0)" >> "${GITHUB_OUTPUT}" + + provenance: + needs: [build] + permissions: + actions: read # To read the workflow path. + id-token: write # To sign the provenance. + contents: write # To add assets to a release. + uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.4.0 + with: + base64-subjects: "${{ needs.build.outputs.digests }}" + upload-assets: true # Optional: Upload to a new release From 060abf0f4ad100b4b78278955710525d5357f819 Mon Sep 17 00:00:00 2001 From: abdulrahman305 Date: Fri, 21 Jun 2024 03:17:13 +0300 Subject: [PATCH 03/14] Create rust.yml --- .github/workflows/rust.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/rust.yml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml new file mode 100644 index 000000000..9fd45e090 --- /dev/null +++ b/.github/workflows/rust.yml @@ -0,0 +1,22 @@ +name: Rust + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build + run: cargo build --verbose + - name: Run tests + run: cargo test --verbose From 4d8a25ad05366933b670ec2d93070d8dd224e1c9 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 2 Jul 2024 17:19:19 +0000 Subject: [PATCH 04/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/b84198ce-387f-40a2-9108-81dc921da607?utm_source=github&utm_medium=referral&page=upgrade-pr --- resources/language-metavariables/tree-sitter-css/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-css/package.json b/resources/language-metavariables/tree-sitter-css/package.json index e79cd7dd1..47d97ef12 100644 --- a/resources/language-metavariables/tree-sitter-css/package.json +++ b/resources/language-metavariables/tree-sitter-css/package.json @@ -20,7 +20,7 @@ "devDependencies": { "eslint": ">=5.16.0", "eslint-config-google": "^0.14.0", - "tree-sitter-cli": "^0.20.8" + "tree-sitter-cli": "^0.22.6" }, "scripts": { "build": "tree-sitter generate && node-gyp build", From 265555a7311332235d2ce1cd451476f4b48e88c2 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 2 Jul 2024 18:28:00 +0000 Subject: [PATCH 05/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/d0d88628-ed6d-4d56-9934-a879dc24a83e?utm_source=github&utm_medium=referral&page=upgrade-pr --- .../language-metavariables/tree-sitter-c-sharp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-c-sharp/package.json b/resources/language-metavariables/tree-sitter-c-sharp/package.json index c166083c9..c0b068bf8 100644 --- a/resources/language-metavariables/tree-sitter-c-sharp/package.json +++ b/resources/language-metavariables/tree-sitter-c-sharp/package.json @@ -18,7 +18,7 @@ "nan": "^2.14.0" }, "devDependencies": { - "tree-sitter-cli": "^0.20.0" + "tree-sitter-cli": "^0.22.6" }, "scripts": { "test": "tree-sitter test && script/update-file-sizes && script/parse-examples", From 10b6721790314c145633539f731e047a59b1cd7d Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 2 Jul 2024 19:05:10 +0000 Subject: [PATCH 06/14] fix: upgrade com.github.javaparser:javaparser-core from 3.5.9 to 3.26.0 Snyk has created this PR to upgrade com.github.javaparser:javaparser-core from 3.5.9 to 3.26.0. See this package in maven: com.github.javaparser:javaparser-core See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/47526198-b676-4801-836f-ec896130d73a?utm_source=github&utm_medium=referral&page=upgrade-pr --- .../tree-sitter-java/script/run-javaparser/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-java/script/run-javaparser/pom.xml b/resources/language-metavariables/tree-sitter-java/script/run-javaparser/pom.xml index 4d909d013..b87476a49 100644 --- a/resources/language-metavariables/tree-sitter-java/script/run-javaparser/pom.xml +++ b/resources/language-metavariables/tree-sitter-java/script/run-javaparser/pom.xml @@ -18,7 +18,7 @@ com.github.javaparser javaparser-core - 3.5.9 + 3.26.0 From 7a24a234eb3352805b575afefe8ec628a35d398a Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 2 Jul 2024 19:26:50 +0000 Subject: [PATCH 07/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/895a58f8-8171-4c0f-bb16-aab6ad6b61ae?utm_source=github&utm_medium=referral&page=upgrade-pr --- resources/language-metavariables/tree-sitter-html/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-html/package.json b/resources/language-metavariables/tree-sitter-html/package.json index bbb08e580..ef511fdf9 100644 --- a/resources/language-metavariables/tree-sitter-html/package.json +++ b/resources/language-metavariables/tree-sitter-html/package.json @@ -27,7 +27,7 @@ "devDependencies": { "eslint": "^8.50.0", "eslint-config-google": "^0.14.0", - "tree-sitter-cli": "^0.20.8" + "tree-sitter-cli": "^0.22.6" }, "scripts": { "build": "tree-sitter generate && node-gyp build", From 783265ba3a20e94836423ed67b6e25d862b6f84a Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 2 Jul 2024 20:12:50 +0000 Subject: [PATCH 08/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/3c076cc9-3c6f-4d40-bdb5-c379022d47e1?utm_source=github&utm_medium=referral&page=upgrade-pr --- resources/language-metavariables/tree-sitter-rust/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-rust/package.json b/resources/language-metavariables/tree-sitter-rust/package.json index c72a909d8..682885468 100644 --- a/resources/language-metavariables/tree-sitter-rust/package.json +++ b/resources/language-metavariables/tree-sitter-rust/package.json @@ -19,7 +19,7 @@ "devDependencies": { "eslint": "^8.47.0", "eslint-config-google": "^0.14.0", - "tree-sitter-cli": "^0.20.8" + "tree-sitter-cli": "^0.22.6" }, "scripts": { "build": "tree-sitter generate && node-gyp build", From 40910675b56ab03bde62e8646cd03c1ab98e7917 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 2 Aug 2024 05:13:00 +0000 Subject: [PATCH 09/14] fix: resources/language-metavariables/tree-sitter-sql/docs/Gemfile & resources/language-metavariables/tree-sitter-sql/docs/Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-REXML-7577227 - https://snyk.io/vuln/SNYK-RUBY-REXML-7577228 --- .../tree-sitter-sql/docs/Gemfile | 2 +- .../tree-sitter-sql/docs/Gemfile.lock | 44 +++++++++++-------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/resources/language-metavariables/tree-sitter-sql/docs/Gemfile b/resources/language-metavariables/tree-sitter-sql/docs/Gemfile index c7abd8edd..274f5b70d 100644 --- a/resources/language-metavariables/tree-sitter-sql/docs/Gemfile +++ b/resources/language-metavariables/tree-sitter-sql/docs/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "jekyll", "~> 4.3.2" +gem "jekyll", "~> 4.3.3" group :development do gem 'webrick' diff --git a/resources/language-metavariables/tree-sitter-sql/docs/Gemfile.lock b/resources/language-metavariables/tree-sitter-sql/docs/Gemfile.lock index a9f271b87..5af4347b1 100644 --- a/resources/language-metavariables/tree-sitter-sql/docs/Gemfile.lock +++ b/resources/language-metavariables/tree-sitter-sql/docs/Gemfile.lock @@ -1,24 +1,25 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) byebug (11.1.3) coderay (1.1.3) colorator (1.1.0) - concurrent-ruby (1.2.0) + concurrent-ruby (1.3.3) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.5) + ffi (1.16.3) forwardable-extended (2.6.0) - google-protobuf (3.22.0-arm64-darwin) - google-protobuf (3.22.0-x86_64-linux) + google-protobuf (3.25.3) + google-protobuf (3.25.3-arm64-darwin) + google-protobuf (3.25.3-x86_64-linux) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (4.3.2) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -43,7 +44,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) @@ -56,29 +57,34 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - public_suffix (5.0.1) + public_suffix (5.1.1) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (4.1.0) + rexml (3.3.4) + strscan + rouge (4.3.0) safe_yaml (1.0.5) - sass-embedded (1.58.2-arm64-darwin) - google-protobuf (~> 3.21) - sass-embedded (1.58.2-x86_64-linux-gnu) - google-protobuf (~> 3.21) + sass-embedded (1.54.6) + google-protobuf (~> 3.19) + rake (>= 10.0.0) + sass-embedded (1.54.6-arm64-darwin) + google-protobuf (~> 3.19) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) PLATFORMS arm64-darwin-21 arm64-darwin-22 + ruby x86_64-linux DEPENDENCIES - jekyll (~> 4.3.2) + jekyll (~> 4.3.3) pry-byebug webrick From a00c3a8b01cff87fe87cdde930250488fd0ef577 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 10 Aug 2024 19:43:11 +0000 Subject: [PATCH 10/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/ce505a2d-919f-4785-b479-681dd77f596b?utm_source=github&utm_medium=referral&page=upgrade-pr --- resources/language-metavariables/tree-sitter-json/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-json/package.json b/resources/language-metavariables/tree-sitter-json/package.json index bb3fd4927..6b53d1440 100644 --- a/resources/language-metavariables/tree-sitter-json/package.json +++ b/resources/language-metavariables/tree-sitter-json/package.json @@ -20,7 +20,7 @@ "devDependencies": { "eslint": ">=8.56.0", "eslint-config-google": "^0.14.0", - "tree-sitter-cli": "^0.20.8", + "tree-sitter-cli": "^0.22.6", "node-gyp": "^10.0.1" }, "scripts": { From c80d1ae495eacae43a4cba9509995f29b1d51095 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 10 Aug 2024 20:32:08 +0000 Subject: [PATCH 11/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/3cc1ceb4-cc01-4dbf-82c1-5606d7ec4907?utm_source=github&utm_medium=referral&page=upgrade-pr --- resources/language-metavariables/tree-sitter-hcl/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-hcl/package.json b/resources/language-metavariables/tree-sitter-hcl/package.json index 382dcb0bf..3b42e5a84 100644 --- a/resources/language-metavariables/tree-sitter-hcl/package.json +++ b/resources/language-metavariables/tree-sitter-hcl/package.json @@ -7,7 +7,7 @@ "license": "ISC", "dependencies": { "nan": "^2.14.2", - "tree-sitter-cli": "^0.20.6" + "tree-sitter-cli": "^0.22.6" }, "tree-sitter": [ { From 19cd9d6cc253009a8ba40ce2f3e9d4a70ba93a3b Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 10 Aug 2024 20:40:27 +0000 Subject: [PATCH 12/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/de2a14d4-1968-488a-b7fa-2587f42c7fed?utm_source=github&utm_medium=referral&page=upgrade-pr --- .../language-metavariables/tree-sitter-markdown/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-markdown/package.json b/resources/language-metavariables/tree-sitter-markdown/package.json index 85d4f664c..50f77a3ae 100644 --- a/resources/language-metavariables/tree-sitter-markdown/package.json +++ b/resources/language-metavariables/tree-sitter-markdown/package.json @@ -19,7 +19,7 @@ "node-pre-gyp": "^0.17.0" }, "devDependencies": { - "tree-sitter-cli": "^0.20.8" + "tree-sitter-cli": "^0.22.6" }, "scripts": { "test": "(cd tree-sitter-markdown && tree-sitter test) && (cd tree-sitter-markdown-inline && tree-sitter test)", From 8f5b674e6399994315066942ebbfc721aeb66594 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 10 Aug 2024 20:40:36 +0000 Subject: [PATCH 13/14] fix: upgrade nan from 2.17.0 to 2.20.0 Snyk has created this PR to upgrade nan from 2.17.0 to 2.20.0. See this package in npm: nan See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/de2a14d4-1968-488a-b7fa-2587f42c7fed?utm_source=github&utm_medium=referral&page=upgrade-pr --- .../language-metavariables/tree-sitter-markdown/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-markdown/package.json b/resources/language-metavariables/tree-sitter-markdown/package.json index 85d4f664c..7a38c3f9e 100644 --- a/resources/language-metavariables/tree-sitter-markdown/package.json +++ b/resources/language-metavariables/tree-sitter-markdown/package.json @@ -15,7 +15,7 @@ "license": "MIT", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.9", - "nan": "^2.17.0", + "nan": "^2.20.0", "node-pre-gyp": "^0.17.0" }, "devDependencies": { From 2724cfcab458f0e3abf348b4db98857fe238af80 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 12 Aug 2024 14:53:37 +0000 Subject: [PATCH 14/14] fix: upgrade tree-sitter-cli from 0.20.8 to 0.22.6 Snyk has created this PR to upgrade tree-sitter-cli from 0.20.8 to 0.22.6. See this package in npm: tree-sitter-cli See this project in Snyk: https://app.snyk.io/org/abdulrahman305/project/a767dda2-1d38-4d53-821e-c4a1735b5e79?utm_source=github&utm_medium=referral&page=upgrade-pr --- .../language-metavariables/tree-sitter-javascript/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/language-metavariables/tree-sitter-javascript/package.json b/resources/language-metavariables/tree-sitter-javascript/package.json index a7c081f33..cf0af3945 100644 --- a/resources/language-metavariables/tree-sitter-javascript/package.json +++ b/resources/language-metavariables/tree-sitter-javascript/package.json @@ -20,7 +20,7 @@ "devDependencies": { "eslint": "^8.56.0", "eslint-config-google": "^0.14.0", - "tree-sitter-cli": "^0.20.8" + "tree-sitter-cli": "^0.22.6" }, "scripts": { "build": "tree-sitter generate && node-gyp build",