Skip to content

Commit

Permalink
Use git dependency for ssi
Browse files Browse the repository at this point in the history
  • Loading branch information
sbihel committed Jul 3, 2024
1 parent b9f4e28 commit c003b77
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 38 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
name: cd

# Temporarily disabled until ssi is published
on:
# push:
# branches: [ main ]
# release:
# types: [published, created, edited]
push:
branches: [ main ]
release:
types: [published, created, edited]
workflow_dispatch:

jobs:
Expand All @@ -32,7 +31,7 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
33 changes: 2 additions & 31 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,16 @@ on:

env:
CARGO_TERM_COLOR: always
SSI_REF: main
RUSTFLAGS: "-Dwarnings"

defaults:
run:
working-directory: didkit-http

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
path: didkit-http
submodules: true

- name: Checkout SSI library
uses: actions/checkout@v4
with:
repository: spruceid/ssi
path: ssi
ref: ${{env.SSI_REF}}
submodules: true

- name: Rust Cache
uses: Swatinem/rust-cache@v2
with:
workspaces: |
didkit-http
- uses: Swatinem/rust-cache@v2

- name: Build
run: cargo build
Expand All @@ -61,19 +42,9 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
path: didkit-http
submodules: true
- name: Checkout SSI library
uses: actions/checkout@v4
with:
repository: spruceid/ssi
path: ssi
ref: ${{env.SSI_REF}}
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- uses: Swatinem/rust-cache@v2
with:
workspaces: |
didkit-http
shared-key: "vc-api"
- uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repository = "https://github.com/spruceid/didkit-http"
exclude = ["/tests"]

[dependencies]
ssi = { version = "0.8.0", path = "../ssi" }
ssi = { git = "https://github.com/spruceid/ssi.git", rev = "10deab4" }

anyhow = "1.0.70"
axum = { version = "0.7.5", features = ["macros"] }
Expand Down

0 comments on commit c003b77

Please sign in to comment.