Skip to content

Commit e2e46f4

Browse files
authored
Merge branch 'main' into fix-wallet-js-publish-process
2 parents 79c502d + 99f6c31 commit e2e46f4

File tree

17 files changed

+49
-23
lines changed

17 files changed

+49
-23
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,20 @@ name: Build
22

33
on:
44
push:
5-
branches: [ "main" ]
6-
paths-ignore: ["README.md", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md"]
5+
branches:
6+
- main
7+
paths-ignore:
8+
- '**.md'
9+
- 'src/**/**.md'
10+
- 'Makefiles/**'
711
pull_request:
8-
branches: [ "main" ]
9-
paths-ignore: ["README.md", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md"]
12+
branches:
13+
- main
14+
paths-ignore:
15+
- '**.md'
16+
- 'book/**'
17+
- 'src/**/**.md'
18+
- 'Makefiles/**'
1019

1120
env:
1221
CARGO_TERM_COLOR: always
@@ -15,6 +24,15 @@ env:
1524
CARGO_INCREMENTAL: 0
1625

1726
jobs:
27+
cancel:
28+
name: 'Cancel Previous Runs'
29+
runs-on: ubuntu-latest
30+
timeout-minutes: 3
31+
steps:
32+
- uses: styfle/[email protected]
33+
with:
34+
access_token: ${{ github.token }}
35+
1836
build_on_linux:
1937
name: Build Catalyst Core on Linux
2038
runs-on: ubuntu-latest
@@ -45,7 +63,7 @@ jobs:
4563
CARGO_FLAGS: --verbose --locked
4664
steps:
4765
- name: Checkout code on PR
48-
#Workaround for the running out of disk space issue. See https://github.com/actions/runner-images/issues/1341
66+
# Workaround for the running out of disk space issue. See https://github.com/actions/runner-images/issues/1341
4967
run: |
5068
mkdir C:\\${{ github.event.repository.name }}
5169
git clone -n -v --progress https://github.com/input-output-hk/${{ github.event.repository.name }}.git C:\\${{ github.event.repository.name }}

.github/workflows/ci_tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ env:
2323
CARGO_INCREMENTAL: 0
2424

2525
jobs:
26+
cancel:
27+
name: 'Cancel Previous Runs'
28+
runs-on: ubuntu-latest
29+
timeout-minutes: 3
30+
steps:
31+
- uses: styfle/[email protected]
32+
with:
33+
access_token: ${{ github.token }}
34+
2635
vit_servicing_station:
2736
name: Vit Servicing Station Tests
2837
runs-on: ubuntu-latest

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
<a href="https://github.com/input-output-hk/catalyst-core/blob/main/CODE_OF_CONDUCT.md">
1515
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome!" />
1616
</a>
17-
<a href='https://coveralls.io/github/input-output-hk/catalyst-core?branch=main'>
18-
<img src='https://coveralls.io/repos/github/input-output-hk/catalyst-core/badge.svg?branch=main' alt='Coverage Status' />
19-
</a>
17+
<a href='https://coveralls.io/github/input-output-hk/catalyst-core?branch=feature/add-ci-coveralls'><img src='https://coveralls.io/repos/github/input-output-hk/catalyst-core/badge.svg?branch=feature/add-ci-coveralls' alt='Coverage Status' />
18+
</a>
2019
</p>
2120

2221
# Content

src/chain-wallet-libs/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9-
## [0.8.1]
9+
## [0.8.2]
1010
- Updated Javascript wallet bindings, initial version of CIP-62 specification API.
1111
- *breaking change*: wallet_spending_counter replaced by wallet_spending_counters
1212
- *breaking change*: wallet_set_state now takes an array of spending counters

src/chain-wallet-libs/bindings/wallet-cordova/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wallet-cordova-plugin",
3-
"version": "0.8.1",
3+
"version": "0.8.2",
44
"description": "Jormungandr wallet Cordova Plugin",
55
"cordova": {
66
"id": "wallet-cordova-plugin",

src/chain-wallet-libs/bindings/wallet-cordova/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22

3-
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="wallet-cordova-plugin" version="0.8.1">
3+
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="wallet-cordova-plugin" version="0.8.2">
44
<name>Wallet Cordova Plugin</name>
55
<description>Wallet Cordova Plugin</description>
66
<license>MIT OR Apache-2.0 </license>

src/chain-wallet-libs/bindings/wallet-cordova/tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wallet-cordova-plugin-tests",
3-
"version": "0.8.1",
3+
"version": "0.8.2",
44
"description": "",
55
"cordova": {
66
"id": "wallet-cordova-plugin-tests",

src/chain-wallet-libs/bindings/wallet-cordova/tests/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
id="wallet-cordova-plugin-tests"
5-
version="0.8.1">
5+
version="0.8.2">
66
<name>Wallet cordova plugin tests</name>
77
<license>Apache 2.0 OR MIT</license>
88

src/chain-wallet-libs/bindings/wallet-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = [
66
edition = "2018"
77
license = "MIT OR Apache-2.0"
88
name = "wallet-core"
9-
version = "0.8.1"
9+
version = "0.8.2"
1010

1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

src/chain-wallet-libs/bindings/wallet-uniffi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "wallet-uniffi"
3-
version = "0.8.1"
3+
version = "0.8.2"
44
edition = "2018"
55

66
[lib]

0 commit comments

Comments
 (0)