Skip to content

Un-force the openssl version on build.sh #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filfreire merged 4 commits into from
Oct 21, 2022
Merged

Un-force the openssl version on build.sh #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d77b108
Un-force the openssl version on build.sh
filfreire Oct 21, 2022
f18cef5
tidy up action version numbers
filfreire Oct 21, 2022
06fc39e
bump package.json version
filfreire Oct 21, 2022
a9c27be
rm cat_slower, use no-tests instead of no-test
filfreire Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build-and-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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: |
Expand All @@ -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/
Expand Down Expand Up @@ -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 }}
Expand All @@ -155,15 +155,15 @@ 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 }}
restore-keys: |
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: |
Expand All @@ -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/
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -201,15 +201,15 @@ 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 }}
restore-keys: |
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: |
Expand All @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/build-openssl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
19 changes: 3 additions & 16 deletions scripts/ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down