Skip to content

Commit 534c255

Browse files
committed
Merge branch 'main' into obrok/merge-main
2 parents e1f7212 + 57566a3 commit 534c255

File tree

5 files changed

+101
-2
lines changed

5 files changed

+101
-2
lines changed

.github/scripts/run_e2e_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fi
113113

114114
if [[ -n "${ADDER:-}" ]]; then
115115
ARGS+=(-e "ADDER=${ADDER}")
116-
ARGS+=(-e "ADDER_METADATA=/contracts/adder/target/ink/adder.json")
116+
ARGS+=(-e "ADDER_METADATA=/contracts/adder/target/ink/metadata.json")
117117
fi
118118

119119
if [[ -n "${BUTTON_GAME_METADATA:-}" ]]; then

.github/workflows/check-excluded-packages.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ jobs:
4848
uses: actions-rs/toolchain@v1
4949

5050
- name: Check excluded package
51+
env:
52+
RUSTC_WRAPPER: ""
53+
RUSTC_WORKSPACE_WRAPPER: sccache
5154
run: |
5255
cd ${{ matrix.package }}
5356
rustup component add clippy rustfmt

.github/workflows/yaml-lint.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
name: GH Action YAML linter
3+
4+
on:
5+
pull_request:
6+
paths:
7+
- ".github/**/**.yml"
8+
- ".github/**/**.yaml"
9+
10+
concurrency:
11+
group: ${{ github.ref }}-${{ github.workflow }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
main:
16+
name: YAML Lint
17+
runs-on: ubuntu-20.04
18+
steps:
19+
- name: GIT | Checkout source code
20+
uses: actions/checkout@v3
21+
with:
22+
repository: Cardinal-Cryptography/aleph-node
23+
token: ${{ secrets.CI_GH_TOKEN }}
24+
25+
- name: GIT | Check diff
26+
id: check-diff
27+
run: |
28+
git fetch --quiet origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF}
29+
YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only \
30+
| grep -E ".github\/.*\/.*(.yaml|.yml)" | tr '\n' ' '`
31+
echo "Changed YAML files: ${YAML_FILES}"
32+
echo "YAML_FILES=`echo $YAML_FILES`" >> $GITHUB_ENV
33+
34+
- name: LINT | Execute yaml-lint
35+
uses: ibiqlik/[email protected]
36+
with:
37+
strict: true
38+
file_or_dir: ${{ env.YAML_FILES }}
39+
config_file: .yamllint

.yamllint

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
extends: default
3+
4+
rules:
5+
braces:
6+
min-spaces-inside: 0
7+
max-spaces-inside: 0
8+
min-spaces-inside-empty: -1
9+
max-spaces-inside-empty: -1
10+
brackets:
11+
min-spaces-inside: 0
12+
max-spaces-inside: 0
13+
min-spaces-inside-empty: -1
14+
max-spaces-inside-empty: -1
15+
colons:
16+
max-spaces-before: 0
17+
max-spaces-after: 1
18+
commas:
19+
max-spaces-before: 0
20+
min-spaces-after: 1
21+
max-spaces-after: 1
22+
comments:
23+
level: warning
24+
require-starting-space: true
25+
min-spaces-from-content: 2
26+
comments-indentation: disable
27+
document-end: disable
28+
document-start: enable
29+
empty-lines:
30+
max: 2
31+
max-start: 1
32+
max-end: 1
33+
empty-values:
34+
forbid-in-block-mappings: false
35+
forbid-in-flow-mappings: false
36+
hyphens:
37+
max-spaces-after: 1
38+
indentation:
39+
spaces: consistent
40+
indent-sequences: true
41+
check-multi-line-strings: false
42+
key-duplicates: enable
43+
key-ordering: disable
44+
line-length:
45+
max: 100
46+
level: error
47+
allow-non-breakable-words: true
48+
allow-non-breakable-inline-mappings: false
49+
new-line-at-end-of-file: enable
50+
new-lines:
51+
type: unix
52+
trailing-spaces: enable
53+
truthy:
54+
allowed-values:
55+
- "true"
56+
- "false"
57+
check-keys: false

contracts/adder/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ink_build cargo contract build --release --quiet 1>&2
3131
export ADDER
3232

3333
ADDER=$(
34-
ink_build cargo contract instantiate --url "$NODE_URL" --suri "$AUTHORITY" --skip-confirm --output-json \
34+
ink-build cargo contract instantiate --url "$NODE_URL" --suri "$AUTHORITY" --skip-confirm --output-json \
3535
| jq -r ".contract"
3636
)
3737
echo "$ADDER"

0 commit comments

Comments
 (0)