Skip to content

Commit

Permalink
Merge branch 'main' into adam/allow-transfer-of-positions-by-gov-modu…
Browse files Browse the repository at this point in the history
…le-acc
  • Loading branch information
czarcas7ic committed Mar 22, 2024
2 parents 015a2c4 + 9d7c5a4 commit c697ff5
Show file tree
Hide file tree
Showing 63 changed files with 3,844 additions and 716 deletions.
8 changes: 8 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,11 @@ pull_request_rules:
branches:
- v23.x
- v23.x-iavl-v1
- name: backport patches to v24.x branch
conditions:
- base=main
- label=A:backport/v24.x
actions:
backport:
branches:
- v24.x
2 changes: 1 addition & 1 deletion .github/workflows/e2e-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
.github/workflows/e2e-full.yml
- name: Set output
id: vars
run: echo "::set-output name=git_diff::$GIT_DIFF"
run: echo "git_diff=$GIT_DIFF" >> $GITHUB_OUTPUT
outputs:
git_diff: ${{ steps.vars.outputs.git_diff }}

Expand Down
131 changes: 119 additions & 12 deletions .github/workflows/push-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ name: Push Docker Images
on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+" # ignore rc
- "v[0-9]+.[0-9]+.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-iavl-v1"

env:
DOCKER_REPOSITORY: osmolabs/osmosis
Expand All @@ -38,27 +39,34 @@ env:
RUNNER_BASE_IMAGE_ALPINE: alpine:3.17

jobs:
osmosisd-images:
push-docker-images:
runs-on: buildjet-4vcpu-ubuntu-2204
if: ${{ !contains(github.ref_name, 'iavl') }}
steps:
- name: Check out the repo
-
name: Check out the repo
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up QEMU
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
-
name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Find go version
-
name: Find go version
run: |
GO_VERSION=$(cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2)
echo "GO_VERSION=$GO_VERSION" >> $GITHUB_ENV
- name: Parse tag
-
name: Parse tag
id: tag
run: |
VERSION=$(echo ${{ github.ref_name }} | sed "s/v//")
Expand All @@ -70,7 +78,8 @@ jobs:
echo "MINOR_VERSION=$MINOR_VERSION" >> $GITHUB_ENV
echo "PATCH_VERSION=$PATCH_VERSION" >> $GITHUB_ENV
# Distroless Docker image (default)
- name: Build and push (distroless)
-
name: Build and push (distroless)
id: build_push_distroless
uses: docker/build-push-action@v5
with:
Expand All @@ -91,7 +100,8 @@ jobs:
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}-distroless
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-distroless
# Distroless nonroot Docker image
- name: Build and push (nonroot)
-
name: Build and push (nonroot)
id: build_push_nonroot
uses: docker/build-push-action@v5
with:
Expand All @@ -109,7 +119,8 @@ jobs:
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}-nonroot
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-nonroot
# Alpine Docker image
- name: Build and push (alpine)
-
name: Build and push (alpine)
id: build_push_alpine
uses: docker/build-push-action@v5
with:
Expand All @@ -126,7 +137,8 @@ jobs:
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}-alpine
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}-alpine
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-alpine
- if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '.0')
-
if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '.0')
name: Build and push (e2e-chain-init)
uses: docker/build-push-action@v5
with:
Expand All @@ -140,3 +152,98 @@ jobs:
osmolabs/osmosis-e2e-init-chain:${{ env.MAJOR_VERSION }}
osmolabs/osmosis-e2e-init-chain:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}
osmolabs/osmosis-e2e-init-chain:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}
push-iavl-docker-images:
runs-on: buildjet-4vcpu-ubuntu-2204
if: ${{ contains(github.ref_name, 'iavl') }}
steps:
-
name: Check out the repo
uses: actions/checkout@v4
with:
fetch-depth: 0
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
-
name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Find go version
run: |
GO_VERSION=$(cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2)
echo "GO_VERSION=$GO_VERSION" >> $GITHUB_ENV
-
name: Parse tag
id: tag
run: |
VERSION=$(echo ${{ github.ref_name }} | sed "s/v//")
MAJOR_VERSION=$(echo $VERSION | cut -d '.' -f 1)
MINOR_VERSION=$(echo $VERSION | cut -d '.' -f 2)
PATCH_VERSION=$(echo $VERSION | cut -d '.' -f 3)
echo "VERSION=$VERSION" >> $GITHUB_ENV
echo "MAJOR_VERSION=$MAJOR_VERSION" >> $GITHUB_ENV
echo "MINOR_VERSION=$MINOR_VERSION" >> $GITHUB_ENV
echo "PATCH_VERSION=$PATCH_VERSION" >> $GITHUB_ENV
# Distroless Docker image (default)
-
name: Build and push (distroless)
id: build_push_distroless
uses: docker/build-push-action@v5
with:
file: Dockerfile
context: .
push: true
platforms: linux/amd64,linux/arm64
build-args: |
GO_VERSION=${{ env.GO_VERSION }}
RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_DISTROLESS }}
GIT_VERSION=${{ env.VERSION }}
GIT_COMMIT=${{ github.sha }}
tags: |
# osmosis:X.Y.Z-iavl-v1
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}
# osmosis:X.Y.Z-iavl-v1-distroless
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-distroless
# Distroless nonroot Docker image
-
name: Build and push (nonroot)
id: build_push_nonroot
uses: docker/build-push-action@v5
with:
file: Dockerfile
context: .
push: true
platforms: linux/amd64,linux/arm64
build-args: |
GO_VERSION=${{ env.GO_VERSION }}
RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_NONROOT }}
GIT_VERSION=${{ env.VERSION }}
GIT_COMMIT=${{ github.sha }}
tags: |
# osmosis:X.Y.Z-iavl-v1-nonroot
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-nonroot
# Alpine Docker image
-
name: Build and push (alpine)
id: build_push_alpine
uses: docker/build-push-action@v5
with:
file: Dockerfile
context: .
push: true
platforms: linux/amd64,linux/arm64
build-args: |
GO_VERSION=${{ env.GO_VERSION }}
RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_ALPINE }}
GIT_VERSION=${{ env.VERSION }}
GIT_COMMIT=${{ github.sha }}
tags: |
# osmosis:X.Y.Z-iavl-v1-alpine
${{ env.DOCKER_REPOSITORY }}:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}-alpine
4 changes: 2 additions & 2 deletions .github/workflows/stalebot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
activity occurs. Thank you!
days-before-stale: -1
days-before-close: -1
days-before-pr-stale: 14
days-before-pr-close: 6
days-before-pr-stale: 8
days-before-pr-close: 3
exempt-pr-labels: "security, proposal, blocked"
Loading

0 comments on commit c697ff5

Please sign in to comment.