diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 618c9af68..eeb2c4f17 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -66,7 +66,7 @@ jobs: id: yarn-cache-dir run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Restore Yarn Cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: yarn-cache with: path: ${{ steps.yarn-cache-dir.outputs.dir }} @@ -75,7 +75,7 @@ jobs: v1-${{ runner.os }}-yarn-cache-${{ github.ref }}- v1-${{ runner.os }}-yarn-cache- - name: Restore libcurl deps cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: libcurl-deps-cache with: path: | @@ -92,7 +92,7 @@ jobs: GIT_COMMIT=${{ github.sha }} GIT_TAG=$GIT_TAG ./scripts/ci/build.sh - name: Upload artifacts if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build-logs-${{ matrix.os }}-${{ matrix.libcurl-release }}-${{ matrix.node }} path: ./logs/ @@ -146,7 +146,7 @@ jobs: id: yarn-cache-dir run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Restore Yarn Cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: yarn-cache with: path: ${{ steps.yarn-cache-dir.outputs.dir }} @@ -155,7 +155,7 @@ jobs: v1-${{ runner.os }}-yarn-cache-${{ github.ref }}- v1-${{ runner.os }}-yarn-cache- - name: Restore Electron Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/Library/Caches/electron key: v1-${{ runner.os }}-electron-cache-${{ matrix.electron-version }} @@ -163,7 +163,7 @@ jobs: v1-${{ runner.os }}-electron-cache-${{ matrix.electron-version }} v1-${{ runner.os }}-electron-cache- - name: Restore libcurl deps cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: libcurl-deps-cache with: path: | @@ -180,7 +180,7 @@ jobs: GIT_COMMIT=${{ github.sha }} GIT_TAG=$GIT_TAG ./scripts/ci/build.sh - name: Upload artifacts if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build-logs-${{ matrix.os }}-${{ matrix.libcurl-release }}-${{ matrix.electron-version }} path: ./logs/ diff --git a/.github/workflows/build-lint-test.yaml b/.github/workflows/build-lint-test.yaml index d8aebdc80..c1696fe80 100644 --- a/.github/workflows/build-lint-test.yaml +++ b/.github/workflows/build-lint-test.yaml @@ -43,7 +43,7 @@ jobs: - id: timestamp run: echo "timestamp=$(timestamp +%s)" >> $GITHUB_OUTPUT - name: Restore the previous run result - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | run_result @@ -89,7 +89,7 @@ jobs: v1-${{ runner.os }}-yarn-cache-${{ github.ref }}- v1-${{ runner.os }}-yarn-cache- - name: Restore libcurl deps cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: libcurl-deps-cache with: path: | @@ -125,7 +125,7 @@ jobs: fail_ci_if_error: false - name: Upload artifacts if: always() && steps.run_result.outputs.run_result != 'success' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build-logs-${{ matrix.os }}-${{ matrix.libcurl-release }}-${{ matrix.node }} path: ./logs/ @@ -156,7 +156,7 @@ jobs: - id: timestamp run: echo "timestamp=$(timestamp +%s)" >> $GITHUB_OUTPUT - name: Restore the previous run result - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | run_result @@ -192,7 +192,7 @@ jobs: id: yarn-cache-dir run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Restore Yarn Cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: yarn-cache with: path: ${{ steps.yarn-cache-dir.outputs.dir }} @@ -201,7 +201,7 @@ jobs: v1-${{ runner.os }}-yarn-cache-${{ github.ref }}- v1-${{ runner.os }}-yarn-cache- - name: Restore Electron Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/Library/Caches/electron key: v1-${{ runner.os }}-electron-cache-${{ matrix.electron-version }} @@ -209,7 +209,7 @@ jobs: v1-${{ runner.os }}-electron-cache-${{ matrix.electron-version }} v1-${{ runner.os }}-electron-cache- - name: Restore libcurl deps cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: libcurl-deps-cache with: path: | @@ -230,7 +230,7 @@ jobs: ./scripts/ci/build.sh - name: Upload artifacts if: always() && steps.run_result.outputs.run_result != 'success' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build-logs-${{ matrix.os }}-${{ matrix.libcurl-release }}-${{ matrix.electron-version }} path: ./logs/ diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index e5c5b36ce..f668d1c4e 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -50,14 +50,14 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v2 + - uses: actions/cache@v3 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} restore-keys: | ${{ runner.os }}-yarn- - - uses: actions/cache@v2 + - uses: actions/cache@v3 id: deps-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ~/deps diff --git a/package.json b/package.json index 398354e70..1c4edcec8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@getinsomnia/node-libcurl", - "version": "2.3.5-5", + "version": "2.3.5-6", "description": "The fastest http(s) client (and much more) for Node.js - Node.js bindings for libcurl", "keywords": [ "node-curl", diff --git a/scripts/ci/build-openssl.sh b/scripts/ci/build-openssl.sh index c4631303b..e408ef947 100755 --- a/scripts/ci/build-openssl.sh +++ b/scripts/ci/build-openssl.sh @@ -57,7 +57,7 @@ if [ "$MACOS_UNIVERSAL_BUILD" == "true" ]; then -fPIC \ --prefix=$build_folder \ --openssldir=$build_folder \ - no-shared "${@:2}" + no-tests no-shared "${@:2}" make && make install_sw diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index f7ff6aea5..60ee3f1ca 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -41,16 +41,6 @@ if [ "$(uname)" == "Darwin" ]; then export LDFLAGS="$MACOS_TARGET_FLAGS $MACOS_ARCH_FLAGS" fi -function cat_slower() { - echo "cat_slower called" - # Disabled, only really interesting if we need to debug something - # # hacky way to slow down the output of cat - # CI=${CI:-} - # # the grep is to ignore lines starting with | - # # which for config.log files are the source used to test something - # [ "$CI" == "true" ] && (cat $1 | grep "^[^|]" | perl -pe 'select undef,undef,undef,0.0033333333') || true -} - PREFIX_DIR=${PREFIX_DIR:-$HOME} STOP_ON_INSTALL=${STOP_ON_INSTALL:-false} RUN_PREGYP_CLEAN=${RUN_PREGYP_CLEAN:-true} @@ -105,10 +95,7 @@ ls -al $LIBIDN2_BUILD_FOLDER/lib # Build OpenSSL ################### # OpenSSL version must match Node.js one -## OPENSSL_RELEASE=${OPENSSL_RELEASE:-$(node -e "console.log(process.versions.openssl.replace('+quic', ''))")} - -# Forcing release to be 1.1.1r -OPENSSL_RELEASE=1.1.1r +OPENSSL_RELEASE=${OPENSSL_RELEASE:-$(node -e "console.log(process.versions.openssl.replace('+quic', ''))")} OPENSSL_DEST_FOLDER=$PREFIX_DIR/deps/openssl @@ -251,9 +238,9 @@ if [[ $LIBCURL_RELEASE == "LATEST" ]]; then fi LIBCURL_DEST_FOLDER=$PREFIX_DIR/deps/libcurl echo "Building libcurl v$LIBCURL_RELEASE - Latest is v$LATEST_LIBCURL_RELEASE" -./scripts/ci/build-libcurl.sh $LIBCURL_RELEASE $LIBCURL_DEST_FOLDER || (echo "libcurl failed build log:" && cat_slower $LIBCURL_DEST_FOLDER/source/$LIBCURL_RELEASE/config.log && exit 1) +./scripts/ci/build-libcurl.sh $LIBCURL_RELEASE $LIBCURL_DEST_FOLDER || (echo "libcurl failed build log:" && cat $LIBCURL_DEST_FOLDER/source/$LIBCURL_RELEASE/config.log && exit 1) echo "libcurl successful build log:" -cat_slower $LIBCURL_DEST_FOLDER/source/$LIBCURL_RELEASE/config.log +cat $LIBCURL_DEST_FOLDER/source/$LIBCURL_RELEASE/config.log export LIBCURL_BUILD_FOLDER=$LIBCURL_DEST_FOLDER/build/$LIBCURL_RELEASE ls -al $LIBCURL_BUILD_FOLDER/lib