Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SYNC] master => develop #22

Merged
53 commits merged into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
e897acb
Merge branch 'release/0.1.44' into 'master'
aziolek Feb 13, 2024
3b46664
fix: get rewards dtos from rewards services
pik694 Feb 14, 2024
6d05ae4
Merge branch 'hotfix/OCT-1365-fix-rewards-calculator-exceptions' into…
pik694 Feb 14, 2024
c3d0041
OCT-1362 Remove Check stats tip tile from Metrics page
aziolek Feb 14, 2024
c58f3bb
Merge branch 'feature/oct-1362-remove-metrics-tip-tile' into 'master'
aziolek Feb 14, 2024
21c7e07
OCT-1361 Metrics: add staking to epoch funds usage
aziolek Feb 14, 2024
fac075f
Merge branch 'feature/add-staking-to-funds-usage' into 'master'
aziolek Feb 14, 2024
2e7333a
feat: Metrics funds usage -- leftover renamed moved to E{{N+1}}
aziolek Feb 15, 2024
952cf80
OCT-1335 Anvil: Enable locking gas price for forks with EIP-1559 enabled
Feb 16, 2024
df82a4e
Merge branch 'feature/oct-1335-fixed-gas-price' into 'master'
Feb 16, 2024
e9d3576
Added Github actions
mike-code Feb 20, 2024
e1d28e7
fix: patron earnings -- wrong values
aziolek Feb 21, 2024
956a328
Merge pull request #7 from golemfoundation/michal/workflows-debug
mike-code Feb 21, 2024
6488ef6
Add debug message
mike-code Feb 21, 2024
36fedda
Fix 429 docker hub errors
mike-code Feb 21, 2024
4175028
Merge pull request #16 from golemfoundation/michal/pr-debugging
mike-code Feb 21, 2024
7660283
Disable E2E tests. ref CAQD-331
mike-code Feb 22, 2024
b420327
Merge branch 'master' into fix/oct-1370-patron-earnings-wrong-values
aziolek Feb 22, 2024
b437b83
oct-1103
jmikolajczyk Feb 22, 2024
7cc3636
oct-715
jmikolajczyk Feb 22, 2024
df5951b
Merge pull request #18 from golemfoundation/michal/pr-debug
aziolek Feb 22, 2024
d35736d
Merge branch 'master' into refactor/oct-715-bigint
aziolek Feb 23, 2024
014a7ae
Merge branch 'master' into feature/oct-1103-interactive-logo
aziolek Feb 23, 2024
bef80fc
OCT-1370 Patron earnings on Earn view are not displaying correct values
aziolek Feb 23, 2024
817c570
OCT-1383 "Confirm you allocation" pop-up after removing projects befo…
aziolek Feb 23, 2024
cb583e0
fix: enable E2E
aziolek Feb 23, 2024
2bdd8e3
oct-715: cr fixes
jmikolajczyk Feb 23, 2024
86416d5
Merge branch 'master' into feature/oct-1103-interactive-logo
jmikolajczyk Feb 23, 2024
fa9f93d
oct-715: cr fixes
jmikolajczyk Feb 23, 2024
b9baa7a
oct-715: isRewardsDataDefined fix
jmikolajczyk Feb 23, 2024
a3a27aa
oct-1103: onLogoClick logic inversion
jmikolajczyk Feb 23, 2024
1238803
chore: redeploy uat env contracts
pik694 Feb 20, 2024
c0673e5
chore: redeploy master env contracts
pik694 Feb 23, 2024
b2225e3
chore: redeploy master env contracts (#24)
pik694 Feb 23, 2024
6ff70b1
Update Argo app version
mike-code Feb 23, 2024
8dc78f0
Update Argo app version
mike-code Feb 23, 2024
598f961
CAQD-333: Fix error when deployment is missing in argo repo
mike-code Feb 23, 2024
8afa580
oct-1103: e2e tests
jmikolajczyk Feb 23, 2024
152e316
Merge branch 'master' into refactor/oct-715-bigint
aziolek Feb 24, 2024
f7c0383
[STYLE] GET /rewards/budgets/epoch/{epoch} missing 404 description (#23)
aziolek Feb 24, 2024
1bb0dac
Merge branch 'master' into feature/oct-1103-interactive-logo
jmikolajczyk Feb 26, 2024
937e38e
oct-1103: projects change
jmikolajczyk Feb 26, 2024
295fdfd
Merge branch 'master' into refactor/oct-715-bigint
jmikolajczyk Feb 26, 2024
cb50784
oct-715 isAllocateRewardsTipVisible logic fix
jmikolajczyk Feb 26, 2024
720ba89
OCT-1103: Make Octant logo interaction more intuitive (#12)
jmikolajczyk Feb 26, 2024
610837c
fix: allocation value 0 removes an element from allocateView
aziolek Feb 26, 2024
860fc38
fix: remove data availability ensure
aziolek Feb 26, 2024
924bca6
OCT-715: Replace BigNumber with BigInt (#10)
jmikolajczyk Feb 26, 2024
41bc4d1
Fix failing destroy PR action on missing env
mike-code Feb 26, 2024
4ac8da4
CAQD-334: Install node16 explicitly
mike-code Feb 26, 2024
a1b9bba
OCT-1399 Wrong epoch number in patron's history item header (#27)
aziolek Feb 27, 2024
a417e30
OCT-1287: removed glm claim
jmikolajczyk Feb 27, 2024
86a7fba
OCT-1287: Remove code related to GLM claiming from client (#30)
jmikolajczyk Feb 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
481 changes: 481 additions & 0 deletions .github/workflows/ci-run.yml

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions .github/workflows/deploy-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: ▶️ Deploy Master
on:
workflow_dispatch:

jobs:
build:
name: Build
uses: ./.github/workflows/tpl-images.yml
secrets: inherit
with:
image-tag: ${{ github.sha }}
run:
name: Run
uses: ./.github/workflows/tpl-start-env.yml
secrets: inherit
with:
git-ref: ${{ github.ref }}
env-type: master
workflow-id: ${{ github.run_id }}
deploy:
name: Deploy
needs:
- build
- run
uses: ./.github/workflows/tpl-deploy-app.yml
with:
env-type: master
branch-head-ref: ${{ github.ref }}
env-id: ${{ needs.run.outputs.env-id }}
deployment-id: ${{ needs.run.outputs.deployment-id }}
image-tag: ${{ github.sha }}
workflow-id: ${{ github.run_id }}
# ---
chain-id: 11155111
network-name: sepolia
chain-name: sepolia
snapshotter-enabled: true
scheduler-enabled: true
vault-confirm-withdrawals-enabled: true
glm-claim-enabled: true
secrets: inherit
105 changes: 105 additions & 0 deletions .github/workflows/deploy-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
---
name: ♻ PR Deployment
on:
issue_comment:
types: [created]

jobs:
build:
name: Build
needs:
- run
uses: ./.github/workflows/tpl-images.yml
secrets: inherit
with:
image-tag: ${{ needs.run.outputs.sha }}

deploy:
name: Deploy
needs:
- run
- build
uses: ./.github/workflows/tpl-deploy-app.yml
with:
# ---
env-type: pr
branch-head-ref: ${{ needs.run.outputs.ref }}
image-tag: ${{ needs.run.outputs.sha }}
pull-request-id: ${{ needs.run.outputs.pr_id }}
workflow-id: ${{ github.run_id }}
env-id: ${{ needs.run.outputs.env }}
deployment-id: ${{ needs.run.outputs.deployment }}
# ---
deploy-contracts: true
chain-id: 1337
network-name: local
chain-name: localhost
snapshotter-enabled: true
scheduler-enabled: true
vault-confirm-withdrawals-enabled: true
glm-claim-enabled: true
secrets: inherit

run:
name: Run
if: github.event.issue.pull_request && contains(github.event.comment.body, '/deploy')
runs-on:
- metal
outputs:
sha: ${{ steps.comment-branch.outputs.head_sha }}
ref: ${{ steps.comment-branch.outputs.head_ref }}
pr_id: ${{ steps.get-pr-number.outputs.result }}
env: ${{ steps.start-deployment.outputs.env }}
deployment: ${{ steps.start-deployment.outputs.deployment_id }}
steps:
- name: Get PR branch
uses: xt0rted/pull-request-comment-branch@v2
id: comment-branch

- uses: actions/github-script@v7
id: get-pr-number
with:
result-encoding: string
script: |
return (
await github.rest.repos.listPullRequestsAssociatedWithCommit({
commit_sha: '${{ steps.comment-branch.outputs.head_sha }}',
owner: context.repo.owner,
repo: context.repo.repo,
})
).data[0].number;

- uses: actions/[email protected]
with:
path: __local
ref: ${{ steps.comment-branch.outputs.head_ref }}

- name: Get environment name
id: env-name
env:
CI_MERGE_REQUEST_IID: ${{ steps.get-pr-number.outputs.result }}
CI_PIPELINE_ID: ${{ github.run_id }}
run: |
set -ex

export CI_PROJECT_DIR="${GITHUB_WORKSPACE}/__local"

source ${CI_PROJECT_DIR}/ci/argocd/resolve_env.sh $ENV_TYPE
echo "DEPLOYMENT_ID=$DEPLOYMENT_ID" >> $GITHUB_OUTPUT
shell: bash

- name: (debug)
run: |
echo ${{ steps.get-pr-number.outputs.result }}
echo ${{ steps.env-name.outputs.DEPLOYMENT_ID }}
echo ${{ github.run_id }}

- name: start deployment
uses: bobheadxi/deployments@v1
id: start-deployment
with:
step: start
token: ${{ secrets.GH_BOT_TOKEN }}
env: ${{ steps.env-name.outputs.DEPLOYMENT_ID }}
ref: ${{ steps.comment-branch.outputs.head_ref }}
override: true
35 changes: 35 additions & 0 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: ▶️ Deploy Production
on:
push:
tags:
- v[0-9]+.[0-9]+.[0-9]+

env:
IMAGE_TAG: "${{ github.sha }}"
GIT_TAG: "${{ github.ref }}"

jobs:
build:
name: Build
uses: ./.github/workflows/tpl-images.yml
secrets: inherit
with:
image-tag: ${{ github.sha }}
output:
name: Output Variables
needs:
- build
runs-on:
- metal
steps:
- name: Show variables for the CI pipeline
run : |
echo '================================'
echo ' Use the following variables'
echo ''
echo "CI_PIPELINE_SOURCE: pipeline"
echo "DEV_IMAGE_TAG: ${{ github.sha }}"
echo "PROD_IMAGE_TAG: ${GIT_TAG##*/}"
shell: bash

54 changes: 54 additions & 0 deletions .github/workflows/deploy-rc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
name: ▶️ Deploy Release Candidate
on:
workflow_dispatch:

env:
ARGO_REPOSITORY: "https://wildland-bot:${{ secrets.HOUSEKEEPER_CI_TOKEN }}@gitlab.com/golemfoundation/devops/iac/k8s/wildland-k8s-devops.git"
ARGO_REPOSITORY_BRANCH: "github/octant-release-candidate"
IMAGE_TAG: "${{ github.sha }}"
HOUSEKEEPER_GPG_KEY: "${{ secrets.HOUSEKEEPER_GPG_KEY }}"
HOUSEKEEPER_GPG_KEY_ID: "${{ secrets.HOUSEKEEPER_GPG_KEY_ID }}"
HOUSEKEEPER_NAME: "${{ vars.HOUSEKEEPER_NAME }}"
HOUSEKEEPER_EMAIL: "${{ secrets.HOUSEKEEPER_EMAIL }}"

jobs:
build:
name: Build
uses: ./.github/workflows/tpl-images.yml
secrets: inherit
with:
image-tag: ${{ github.sha }}
deploy:
name: Deploy
needs:
- build
runs-on:
- metal
container:
image: registry.gitlab.com/golemfoundation/devops/container-builder/gitops-builder:2ea6d57c
credentials:
username: "doesnt-matter"
password: "${{ secrets.GITLAB_PAT_CONTAINER_BUILDER_DOCKER_IMAGES_READ }}"
steps:
- uses: actions/[email protected]
- run : |
set -ex

gpg --import <(echo $HOUSEKEEPER_GPG_KEY | base64 -d)
git config --global user.name "$HOUSEKEEPER_NAME"
git config --global user.email "$HOUSEKEEPER_EMAIL"
git config --global user.signingkey $HOUSEKEEPER_GPG_KEY_ID

GIT_DIR=`mktemp -d`
git clone -b $ARGO_REPOSITORY_BRANCH $ARGO_REPOSITORY $GIT_DIR

pushd $GIT_DIR

yq -y -i -e ".[].value.value = \"$IMAGE_TAG\"" mainnet/octant-image.values.yaml

git add mainnet/octant-image.values.yaml
git commit -S -m "Changed octant image tag to $IMAGE_TAG at $(date +%Y-%m-%d)" || true

git push
shell: bash
42 changes: 42 additions & 0 deletions .github/workflows/deploy-uat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: ▶️ Deploy UAT
on:
workflow_dispatch:

jobs:
build:
name: Build
uses: ./.github/workflows/tpl-images.yml
secrets: inherit
with:
image-tag: ${{ github.sha }}
run:
name: Run
uses: ./.github/workflows/tpl-start-env.yml
secrets: inherit
with:
git-ref: ${{ github.ref }}
env-type: uat
workflow-id: ${{ github.run_id }}
deploy:
name: Deploy
needs:
- build
- run
uses: ./.github/workflows/tpl-deploy-app.yml
with:
env-type: uat
branch-head-ref: ${{ github.ref }}
env-id: ${{ needs.run.outputs.env-id }}
deployment-id: ${{ needs.run.outputs.deployment-id }}
image-tag: ${{ github.sha }}
workflow-id: ${{ github.run_id }}
# ---
chain-id: 11155111
network-name: sepolia
chain-name: sepolia
snapshotter-enabled: true
scheduler-enabled: true
vault-confirm-withdrawals-enabled: true
glm-claim-enabled: true
secrets: inherit
13 changes: 13 additions & 0 deletions .github/workflows/destroy-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: 🔻 Stop Master
on:
workflow_dispatch:

jobs:
run:
name: Run
uses: ./.github/workflows/tpl-destroy-env.yml
secrets: inherit
with:
env-type: master
delete-env: false
13 changes: 13 additions & 0 deletions .github/workflows/destroy-uat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: 🔻 Stop UAT
on:
workflow_dispatch:

jobs:
run:
name: Run
uses: ./.github/workflows/tpl-destroy-env.yml
secrets: inherit
with:
env-type: uat
delete-env: false
Loading