Merge main into long_lived and fixup conflicts (#397)

* correct wheel matrix arch -> arm (#393) * Add in some small test cases (#394) * Add in some small test cases * minor update * test fixes * small test addition * Significantly speedup javascript bindings tasks by skipping libbls tests and benchmarks (#372) * Streamline the processes of building libbls, testing it, and creating the blspy wheels (#367) * Speedup the process of creating wheels by skipping the compiling and linking of libbls' tests and benchmarks. * We no longer need Windows-specific CMake version checking in setup.py. * We no longer need Windows-specific architecture flag passing in setup.py. * We no longer treat Windows in a special way w.r.t. compiling and linking in setup.py. * We no longer need Windows-specific preparations before starting the process of creating wheels. * We no longer need Windows-specific repairs after wheels creation. * We no longer need the relic_ietf_64 repository and its related tasks. Dedicated to @wjblanke * [Snyk] Upgrade karma-firefox-launcher from 1.3.0 to 2.1.2 (#382) Snyk has created this PR to upgrade karma-firefox-launcher from 1.3.0 to 2.1.2. See this package in npm: https://www.npmjs.com/package/karma-firefox-launcher See this project in Snyk: https://app.snyk.io/org/chia-network/project/e887fc45-cae4-47fc-931a-813664d517cd?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> * Add CodeQL workflow for GitHub code scanning (#350) Co-authored-by: LGTM Migrator <lgtm-migrator@users.noreply.github.com> * [Snyk] Upgrade typescript from 3.9.7 to 5.0.4 (#376) Snyk has created this PR to upgrade typescript from 3.9.7 to 5.0.4. See this package in npm: https://www.npmjs.com/package/typescript See this project in Snyk: https://app.snyk.io/org/chia-network/project/e887fc45-cae4-47fc-931a-813664d517cd?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> * [Snyk] Upgrade @types/node from 11.15.18 to 20.1.5 (#377) Snyk has created this PR to upgrade @types/node from 11.15.18 to 20.1.5. See this package in npm: https://www.npmjs.com/package/@types/node See this project in Snyk: https://app.snyk.io/org/chia-network/project/e887fc45-cae4-47fc-931a-813664d517cd?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> * [Snyk] Upgrade mime from 1.4.1 to 3.0.0 (#378) Snyk has created this PR to upgrade mime from 1.4.1 to 3.0.0. See this package in npm: https://www.npmjs.com/package/mime See this project in Snyk: https://app.snyk.io/org/chia-network/project/e887fc45-cae4-47fc-931a-813664d517cd?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> * [Snyk] Upgrade karma from 6.3.16 to 6.4.2 (#381) Snyk has created this PR to upgrade karma from 6.3.16 to 6.4.2. See this package in npm: https://www.npmjs.com/package/karma See this project in Snyk: https://app.snyk.io/org/chia-network/project/e887fc45-cae4-47fc-931a-813664d517cd?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: William Allen <wallentx@users.noreply.github.com> * [Snyk] Upgrade webpack from 5.76.0 to 5.82.1 (#380) * fix: upgrade webpack from 5.76.0 to 5.82.1 Snyk has created this PR to upgrade webpack from 5.76.0 to 5.82.1. See this package in npm: https://www.npmjs.com/package/webpack See this project in Snyk: https://app.snyk.io/org/chia-network/project/e887fc45-cae4-47fc-931a-813664d517cd?utm_source=github&utm_medium=referral&page=upgrade-pr * Update package.json --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: William Allen <wallentx@users.noreply.github.com> * [Snyk] Upgrade @types/mocha from 5.2.7 to 10.0.1 (#379) Snyk has created this PR to upgrade @types/mocha from 5.2.7 to 10.0.1. See this package in npm: https://www.npmjs.com/package/@types/mocha See this project in Snyk: https://app.snyk.io/org/chia-network/project/e887fc45-cae4-47fc-931a-813664d517cd?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: William Allen <wallentx@users.noreply.github.com> * Update build-wheels.yml to add Windows pre processing back (#398) It looks like the windows steps are missing. * Update setup.py * integrate amine's cmake unification (#399) * pin windows blst clone * import setuptools * setuptools * revert * back to no changes * amine * remove gmp * add assembly * windows cmake * cmake syntax * avoid gcc flags on win * full name * Keeping pre-release logic and changes from known working builds --------- Co-authored-by: Kyle Altendorf <sda@fstab.net> Co-authored-by: Amine Khaldi <amine.khaldi@reactos.org> Co-authored-by: ChiaAutomation <85647627+ChiaAutomation@users.noreply.github.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: lgtm-com[bot] <43144390+lgtm-com[bot]@users.noreply.github.com> Co-authored-by: LGTM Migrator <lgtm-migrator@users.noreply.github.com> Co-authored-by: William Allen <wallentx@users.noreply.github.com> Co-authored-by: Gene Hoffman <30377676+hoffmang9@users.noreply.github.com> Co-authored-by: wjblanke <wjb98672@gmail.com> Co-authored-by: wallentx <william.allentx@gmail.com>
Chia-Network · Jun 20, 2023 · 7b3c3e3 · 7b3c3e3
1 parent 9a9cedb
commit 7b3c3e3
Show file tree

Hide file tree

Showing 12 changed files with 543 additions and 520 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -44,31 +44,31 @@ jobs:
           - major-dot-minor: '3.7'
             cibw-build: 'cp37-*'
             manylinux:
-              arch: manylinux2014
+              arm: manylinux2014
               intel: manylinux2014
             matrix: '3.7'
           - major-dot-minor: '3.8'
             cibw-build: 'cp38-*'
             manylinux:
-              arch: manylinux2014
+              arm: manylinux2014
               intel: manylinux2014
             matrix: '3.8'
           - major-dot-minor: '3.9'
             cibw-build: 'cp39-*'
             manylinux:
-              arch: manylinux2014
+              arm: manylinux2014
               intel: manylinux2014
             matrix: '3.9'
           - major-dot-minor: '3.10'
             cibw-build: 'cp310-*'
             manylinux:
-              arch: manylinux2014
+              arm: manylinux2014
               intel: manylinux2014
             matrix: '3.10'
           - major-dot-minor: '3.11'
             cibw-build: 'cp311-*'
             manylinux:
-              arch: manylinux2014
+              arm: manylinux2014
               intel: manylinux2014
             matrix: '3.11'
         arch:
@@ -113,7 +113,6 @@ jobs:
         fetch-depth: 0
 
     - name: Set Env
-      if: env.RUNNER_ARCH != 'ARM64'
       uses: Chia-Network/actions/setjobenv@main
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -155,13 +154,6 @@ jobs:
         CIBW_BEFORE_BUILD_MACOS: >
           python -m pip install --upgrade pip
         CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.14"
-        CIBW_BEFORE_ALL_WINDOWS: >
-          curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-msvc.zip > libsodium-1.0.18-stable-msvc.zip
-          && 7z x libsodium-1.0.18-stable-msvc.zip
-          && git clone https://github.com/supranational/blst.git
-          && ls -l blst
-        CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >
-          cp {wheel} {dest_dir}
         CIBW_TEST_REQUIRES: pytest
         CIBW_TEST_COMMAND: py.test -v {project}/python-bindings/test.py
       run:
@@ -201,6 +193,11 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Set Env
+      uses: Chia-Network/actions/setjobenv@main
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - uses: Chia-Network/actions/setup-python@main
       with:
         python-version: ${{ matrix.python.major-dot-minor }}
@@ -287,11 +284,6 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set Env
-      uses: Chia-Network/actions/setjobenv@main
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
     - uses: Chia-Network/actions/setup-python@main
       with:
         python-version: ${{ matrix.python.major-dot-minor }}

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -0,0 +1,53 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: "35 9 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ javascript, python, cpp ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: After Prepare (cpp)
+        if: ${{ matrix.language == 'cpp' }}
+        run: |
+          mkdir custom_cmake
+          wget --quiet -O - "https://cmake.org/files/v3.16/cmake-3.16.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C custom_cmake
+          export PATH=$(pwd)/custom_cmake/bin:${PATH} && echo "PATH=$PATH" >> $GITHUB_ENV
+          cd $GITHUB_WORKSPACE/
+          export CMAKE_INCLUDE_PATH=$GITHUB_WORKSPACE/include:${CMAKE_INCLUDE_PATH} && echo "CMAKE_INCLUDE_PATH=$CMAKE_INCLUDE_PATH" >> $GITHUB_ENV
+          export CMAKE_LIBRARY_PATH=$GITHUB_WORKSPACE/lib:${CMAKE_LIBRARY_PATH} && echo "CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH" >> $GITHUB_ENV
+          mkdir $GITHUB_WORKSPACE/_lgtm_build_dir
+          cd $GITHUB_WORKSPACE/_lgtm_build_dir
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,7 @@ include(FetchContent)
 
 FetchContent_Declare(Sodium
   GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git
+
   # Latest commit at the moment this was added here
   # Anchored to libsodium v1.0.18
   GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65

diff --git a/emsdk_build.sh b/emsdk_build.sh
@@ -6,5 +6,5 @@ rm -rf js_build
 mkdir -p js_build
 cd js_build
 
-emcmake cmake -G "Unix Makefiles" ..
+emcmake cmake -G "Unix Makefiles" -DBUILD_BLS_TESTS=0 -DBUILD_BLS_BENCHMARKS=0 ..
 emmake make