Skip to content

Commit

Permalink
Merge branch 'prep-0.15.0-rc1' into async-storage
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Bruijnzeels committed Nov 15, 2023
2 parents 9760f52 + dd27534 commit 764e88a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
args: ["--no-default-features", "", "--features all"]
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Rust
uses: hecrj/setup-rust-action@v1
with:
Expand All @@ -70,22 +70,22 @@ jobs:
features: ["hsm", "hsm,hsm-tests-kmip"]
steps:
- name: Checkout repository
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Install Rust
uses: hecrj/setup-rust-action@v1
uses: hecrj/setup-rust-action@v2
with:
rust-version: ${{ matrix.rust }}

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.x'
# Pin to Python 3.11 because 3.12 removes the ssl.wrap_socket()
# function which PyKMIP uses.
python-version: '3.11'

- name: Install PyKMIP
uses: BSFishy/pip-action@v1
with:
packages: pykmip
constraints: test-resources/pykmip/constraints.txt
run: |
pip install pykmip --constraint test-resources/pykmip/constraints.txt
- name: Compile the tests
run: |
Expand Down Expand Up @@ -116,10 +116,10 @@ jobs:
features: ["hsm,hsm-tests-pkcs11"]
steps:
- name: Checkout repository
uses: actions/checkout@v1
uses: actions/checkout@v2

- name: Install Rust
uses: hecrj/setup-rust-action@v1
uses: hecrj/setup-rust-action@v2
with:
rust-version: ${{ matrix.rust }}

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
# Note: some of these values are also used when building Debian packages below.
name = "krill"
version = "0.14.2"
version = "0.15.0-dev"
edition = "2018"
rust-version = "1.65"
authors = ["NLnet Labs <rpki-team@nlnetlabs.nl>"]
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ in this [blog post](https://blog.nlnetlabs.nl/testing-the-waters-with-krill/).

# Changelog

## Unreleased Version

## 0.14.2 'Extra, Extra, Extra!'

This release fixes an additional corner case in the migration code that affects
Expand Down

0 comments on commit 764e88a

Please sign in to comment.