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

feat: Handle more expressive types++ #49

Merged
merged 5 commits into from
Feb 16, 2023
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
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use_flake

export RUST_LOG=debug,sqlx=warn,atuin_client=warn
export RUST_LOG=ipvm=info,sqlx=warn,atuin_client=warn
export RUST_BACKTRACE=1
11 changes: 10 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ version: 2

updates:
- package-ecosystem: "cargo"
directory: "/"
directory: "/ipvm"
commit-message:
prefix: "chore"
include: "scope"
target-branch: "main"
schedule:
interval: "weekly"

- package-ecosystem: "cargo"
directory: "/ipvm-guest-wasm"
commit-message:
prefix: "chore"
include: "scope"
Expand Down
63 changes: 0 additions & 63 deletions .github/workflows/bench.yml

This file was deleted.

49 changes: 2 additions & 47 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [ main ]

pull_request:
branches: [ '*' ]
branches: [ '**' ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -45,54 +45,9 @@ jobs:
with:
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/ipvm:latest
cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/ipvm:latest,mode=max
file: docker/Dockerfile
context: .
platforms: linux/amd64, linux/arm64
push: false
tags: |
${{ github.repository_owner }}/ipvm:latest

push-docker-build:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' }}

env:
DOCKER_BUILDKIT: 1

steps:
- name: Checkout Repository
uses: actions/checkout@v3

# https://github.com/docker/setup-qemu-action
- name: Setup QEMU
uses: docker/setup-qemu-action@v2

# https://github.com/docker/setup-buildx-action
- name: Setup Buildx
uses: docker/setup-buildx-action@v2
with:
buildkitd-flags: "--debug"

- name: Login to Dockerhub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker Build and Push
uses: docker/build-push-action@v4
with:
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/ipvm:latest
cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/ipvm:latest,mode=max
context: .
platforms: linux/amd64, linux/arm64
push: true
tags: |
${{ github.repository_owner }}/ipvm:latest
ghcr.io/${{ github.repository_owner }}/ipvm:latest
27 changes: 15 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'

outputs:
release_created: ${{ steps.release.outputs.release_created }}
releases_created: ${{ steps.release.outputs" }}['ipvm--release_created'] || steps.release.outputs['wit-ipld--release_created'] }}

steps:
- name: Run release-please
Expand All @@ -39,22 +39,17 @@ jobs:
extra-files: |
README.md

publish-release:
publish-release-crates:
runs-on: ubuntu-latest
needs: [ release-please ]

permissions:
contents: write
pull-requests: write

if: ${{ needs.release-please.outputs.release_created || github.event.inputs.force-publish }}
if: ${{ needs.release-please.outputs.releases_created || github.event.inputs.force-publish }}

steps:
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout Repository
uses: actions/checkout@v3

Expand All @@ -68,12 +63,20 @@ jobs:
profile: minimal
toolchain: stable

- name: Verify Publishing of crate
- name: Install Cargo Workspaces
env:
RUSTFLAGS: '-Copt-level=1'
uses: actions-rs/cargo@v1
with:
args: --force cargo-workspaces
command: install

- name: Verify Publishing of crates
uses: katyo/publish-crates@v2
with:
dry-run: true

- name: Cargo Publish to crates.io
uses: katyo/publish-crates@v2
with:
registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
run: cargo workspaces publish --from-git
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repos:
description: Lint via clippy
entry: cargo clippy
language: system
args: ["--", "-D", "warnings"]
args: ["--workspace", "--", "-D", "warnings"]
types: [rust]
pass_filenames: false
- id: alejandra
Expand All @@ -38,7 +38,7 @@ repos:
rev: v1.0.9
hooks:
- id: cargo-sort
args: []
args: ["-w"]

- repo: https://github.com/compilerla/conventional-pre-commit
rev: v2.1.1
Expand Down
3 changes: 2 additions & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
".": "0.1.0"
"ipvm": "0.1.0",
"ipvm-guest-wasm": "0.1.0"
}
Loading