Skip to content

Commit

Permalink
Remove OpenSSL dependency (#71)
Browse files Browse the repository at this point in the history
* chore: update dependencies and remove justfile

- Updated `indexmap` from 2.4.0 to 2.5.0 in `Cargo.lock`
- Updated `prost` and related packages from 0.13.1 to 0.13.2 in `Cargo.lock`
- Updated `syn` from 2.0.76 to 2.0.77 in `Cargo.lock`
- Updated `tokio` from 1.39.3 to 1.40.0 in `Cargo.lock`
- Updated `webpki-roots` from 0.26.3 to 0.26.5 in `Cargo.lock`
- Modified `README.md` to update development environment setup instructions
- Removed `just` dependency and related setup from `dev.sh`
- Deleted `justfile` as it is no longer needed

* chore: remove unused dependencies and update build scripts

- Removed unused dependencies from Cargo.toml files in `cli` and `worker` directories.
- Updated `.envrc` to remove paths and environment variables related to `openssl`.
- Modified GitHub Actions workflow to replace `just` commands with `make` commands.
- Added `makefile` to manage build, check, format, lint, and test commands.
- Updated `dev.sh` to remove `openssl` installation steps.
- Updated `.gitignore` to include `dist` directory and tarball files.
- Updated `README.md` to reflect changes in build commands.
- Updated `vorpal.ncl` with new `cargo_hash`.

* refactor: update dependencies and remove unused packages

- Updated `Cargo.lock` to remove unused dependencies and add new ones.
- Changed dependencies in `cli/Cargo.toml` to disable default features and specify required features.
- Modified `notary/Cargo.toml` to disable default features and specify required features.
- Updated `schema/Cargo.toml` to disable default features and specify required features.
- Adjusted `store/Cargo.toml` to disable default features and specify required features.
- Updated `vorpal.ncl` with a new cargo hash.
- Modified `worker/Cargo.toml` to disable default features and specify required features.

* fix(workflow): correct syntax error in vorpal.yaml

Corrected the syntax error in the vorpal.yaml file by removing an extra dollar sign in the OS environment variable assignment.

* chore(workflow): update vorpal.yaml

- Remove unused REGISTRY environment variable
- Add prebake step before format and dist steps in the workflow
  • Loading branch information
erikreinert authored Sep 1, 2024
1 parent ec8ab73 commit c95c126
Show file tree
Hide file tree
Showing 14 changed files with 286 additions and 865 deletions.
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

0 comments on commit c95c126

Please sign in to comment.