Skip to content
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.

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

Remove OpenSSL dependency #71

Merged
merged 5 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
use_dev() {
PATH_add "$HOME/.cargo/bin"
PATH_add "$PWD/deps/just/bin"
PATH_add "$PWD/deps/nickel/bin"
PATH_add "$PWD/deps/openssl/bin"
PATH_add "$PWD/deps/protoc/bin"
export NICKEL_IMPORT_PATH="$PWD/.vorpal/packages:$PWD"
export OPENSSL_DIR="$PWD/deps/openssl"
$PWD/dev.sh
}

Expand Down
26 changes: 8 additions & 18 deletions .github/workflows/vorpal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
- main

env:
REGISTRY: ghcr.io
RUST_VERSION: 1.80.1

jobs:
Expand All @@ -27,10 +26,8 @@ jobs:
key: cache-dev-deps-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('dev.sh') }}
path: deps

- run: ./dev.sh
- run: ./dev.sh which just
- run: ./dev.sh # prebake
- run: ./dev.sh which nickel
- run: ./dev.sh which openssl
- run: ./dev.sh which protoc

- uses: actions/cache/save@v4
Expand All @@ -55,8 +52,9 @@ jobs:
key: package-target-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
path: target

- run: ./dev.sh just format
- run: ./dev.sh just lint
- run: ./dev.sh # prebake
- run: ./dev.sh make format
- run: ./dev.sh make lint

package:
needs:
Expand All @@ -81,20 +79,12 @@ jobs:
key: package-target-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
path: target

- run: ./dev.sh just check --release
- run: ./dev.sh just build --release
- run: ./dev.sh just test --release
- run: ./dev.sh # prebake
- run: ./dev.sh make dist

- run: |
ARCH=$(uname -m | tr '[:upper:]' '[:lower:]')
OS=$(uname -s | tr '[:upper:]' '[:lower:]')

echo "ARCH=$ARCH" >> $GITHUB_ENV
echo "OS=$OS" >> $GITHUB_ENV

mkdir -p dist
cp ./target/release/vorpal ./dist/vorpal
tar -czvf "vorpal-${ARCH}-${OS}.tar.gz" -C ./dist vorpal
echo "ARCH=$(uname -m | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
echo "OS=$(uname -s | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV

- uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
deps
dist
target
vorpal-*-*.tar.gz
Loading
Loading