Skip to content

Commit

Permalink
Merge branch 'main' into mmulji-ic/update-ics-docs-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
MSalopek committed Dec 5, 2023
2 parents c0d0c28 + 164facb commit bae8cd8
Show file tree
Hide file tree
Showing 22 changed files with 221 additions and 114 deletions.
12 changes: 11 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v2.1.x-provider-lsm"
target-branch: "release/v2.4.x-lsm"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand Down Expand Up @@ -77,3 +77,13 @@ updates:
open-pull-requests-limit: 0
labels:
- dependencies

- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
target-branch: "release/v3.3.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
- dependencies
2 changes: 2 additions & 0 deletions .github/issue_labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
needs-triage: # if no label is set then set triage
- ''
48 changes: 28 additions & 20 deletions .github/pr_labeler.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
"C:x/consumer":
- x/ccv/consumer/**/*
- changed-files:
- any-glob-to-any-file: x/ccv/consumer/**
"C:x/democracy":
- x/ccv/democracy/**/*
- changed-files:
- any-glob-to-any-file: x/ccv/democracy/**
"C:x/provider":
- x/ccv/provider/**/*
- changed-files:
- any-glob-to-any-file: x/ccv/provider/**
"C:x/types":
- x/ccv/types/**/*
- changed-files:
- any-glob-to-any-file: x/ccv/types/**
"C:Docs":
- docs/docs/**/*
- changed-files:
- any-glob-to-any-file: docs/docs/**
"C:ADR":
- docs/docs/adrs/**/*
- changed-files:
- any-glob-to-any-file: docs/docs/adrs/**
"C:CI":
- .github/**/*.yml
- buf.work.yaml
- .mergify.yml
- .golangci.yml
- mlc_config.json
- sonar-project.properties
- changed-files:
- any-glob-to-any-file: .github/**/*.yml
- any-glob-to-any-file: buf.work.yaml
- any-glob-to-any-file: .mergify.yml
- any-glob-to-any-file: .golangci.yml
- any-glob-to-any-file: mlc_config.json
- any-glob-to-any-file: sonar-project.properties
"C:Build":
- Makefile
- Dockerfile
- scripts/*
- changed-files:
- any-glob-to-any-file: Makefile
- any-glob-to-any-file: Dockerfile
- any-glob-to-any-file: scripts/**
"C:Testing":
- app/**/*
- cmd/**/*
- legacy_ibc_testing/**/*
- tests/**/*
- testutil/**/*
- changed-files:
- any-glob-to-any-file: app/**
- any-glob-to-any-file: cmd/**
- any-glob-to-any-file: tests/**
- any-glob-to-any-file: testutil/**
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@ name: "CodeQL"

on:
push:
branches:
- main
- feat/*

paths-ignore:
- "legacy_ibc_testing"
paths:
- "**.go"
pull_request:
branches:
- main
- release/*
- feat/*
paths-ignore:
- "legacy_ibc_testing"
paths:
- "**.go"
schedule:
# ┌───────────── minute (0 - 59)
# │ ┌───────────── hour (0 - 23)
Expand All @@ -27,28 +24,33 @@ on:
- cron: "30 1 * * 0"

jobs:
CodeQL-Build:
# CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
analyze:
name: Analyze
runs-on: ubuntu-latest

permissions:
# required for all workflows
security-events: write

# only required for workflows in private repositories
actions: read
contents: read
security-events: write

steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: actions/setup-go@v4
with:
go-version: "1.20"
check-latest: true
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
# Override language selection by uncommenting this and choosing your languages
with:
languages: go
queries: +security-and-quality,github/codeql/go/ql/src/experimental/InconsistentCode/DeferInLoop.ql@main,github/codeql/go/ql/src/experimental/Unsafe/WrongUsageOfUnsafe.ql@main,github/codeql/go/ql/src/experimental/CWE-369/DivideByZero.ql@main
packs: +crypto-com/cosmos-sdk-codeql
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below).
Expand Down
47 changes: 17 additions & 30 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,34 @@
name: golangci-lint
name: Lint
on:
push:
tags:
- v*
branches:
- master
- main
- release/**
- feat/*
pull_request:
merge_group:
permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read
jobs:
golangci:
name: lint
name: golangci-lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
with:
go-version: '1.20'
- uses: actions/checkout@v4
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
- uses: technote-space/[email protected]
id: git_diff
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.54.1

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
args: --config=.golangci.yml

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true then the all caching functionality will be complete disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
# skip-pkg-cache: true
PATTERNS: |
**/*.go
go.mod
go.sum
**/go.mod
**/go.sum
- uses: actions/checkout@v4
- name: run linting
if: env.GIT_DIFF
run: |
make lint
# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
# skip-build-cache: true
15 changes: 12 additions & 3 deletions .github/workflows/gosec.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
name: gosec
name: Run Gosec
on:
push:
pull_request:
paths:
- "**/*.go"
- "go.mod"
- "go.sum"
branches:
- main
- feat/*
pull_request:
push:
branches:
- main
- feat/*
paths:
- "**/*.go"
- "go.mod"
- "go.sum"

jobs:
Gosec:
runs-on: ubuntu-latest
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/issue_labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "Issue Labeler"
on:
issues:
types: [opened]

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: github/[email protected]
if: join(github.event.issue.labels) == ''
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/issue_labeler.yml
enable-versioned-regex: 0
14 changes: 0 additions & 14 deletions .github/workflows/linkchecker.yml

This file was deleted.

47 changes: 47 additions & 0 deletions .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: "Lint PR"

on:
pull_request_target:
types:
- opened
- edited
- synchronize

permissions:
contents: read

jobs:
main:
permissions:
pull-requests: read # for amannn/action-semantic-pull-request to analyze PRs
statuses: write # for amannn/action-semantic-pull-request to mark status of analyzed PR
runs-on: ubuntu-latest
steps:
- uses: amannn/[email protected]
id: lint_pr_title
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: marocchino/sticky-pull-request-comment@v2
# When the previous steps fails, the workflow would stop. By adding this
# condition you can continue the execution with the populated error message.
if: always() && (steps.lint_pr_title.outputs.error_message != null)
with:
header: pr-title-lint-error
message: |
Hey there and thank you for opening this pull request! 👋🏼
We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted.
Details:
```
${{ steps.lint_pr_title.outputs.error_message }}
```
# Delete a previous comment when the issue has been resolved
- if: ${{ steps.lint_pr_title.outputs.error_message == null }}
uses: marocchino/sticky-pull-request-comment@v2
with:
header: pr-title-lint-error
delete: true
13 changes: 13 additions & 0 deletions .github/workflows/md-link-checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Check Markdown links
on:
pull_request:
paths:
- "**.md"
- "!.github/**"
- "!.changelog/**"
jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gaurav-nelson/[email protected]
2 changes: 1 addition & 1 deletion .github/workflows/pr_labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
pull-requests: write # for actions/labeler to add labels to PRs
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@main
- uses: actions/labeler@v5
with:
configuration-path: .github/pr_labeler.yml
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test
on:
workflow_call:
pull_request:
merge_group:
push:
branches:
- main
Expand Down
14 changes: 11 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ pull_request_rules:
backport:
branches:
- release/v2.0.x-lsm
- name: Backport patches to the release/v2.1.x-provider-lsm branch
- name: Backport patches to the release/v2.4.x-lsm branch
conditions:
- base=main
- label=A:backport/v2.1.x-provider-lsm
- label=A:backport/v2.4.x-lsm
actions:
backport:
branches:
- release/v2.1.x-provider-lsm
- release/v2.4.x-lsm
- name: Backport patches to the release/v3.0.x branch
conditions:
- base=main
Expand All @@ -58,3 +58,11 @@ pull_request_rules:
backport:
branches:
- release/v3.2.x
- name: Backport patches to the release/v3.3.x branch
conditions:
- base=main
- label=A:backport/v3.3.x
actions:
backport:
branches:
- release/v3.3.x
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ test-trace:
### Linting ###
###############################################################################

golangci_version=v1.52.2
golangci_version=v1.54.1

lint:
@echo "--> Running linter"
Expand Down
Loading

0 comments on commit bae8cd8

Please sign in to comment.