Skip to content

Commit

Permalink
Merge pull request #94 from lidofinance/develop
Browse files Browse the repository at this point in the history
Develop to main
  • Loading branch information
vtrush88 authored May 9, 2023
2 parents 229569b + de3cdef commit 8c86fa1
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 128 deletions.
30 changes: 4 additions & 26 deletions .github/workflows/ci-prod.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
name: CI Build prod image

on:
workflow_call:
inputs:
tag:
description: "tag to deploy from"
default: ""
required: false
type: string
release:
types: [released]

permissions:
contents: read
permissions: {}

jobs:
# test:
Expand All @@ -21,27 +15,11 @@ jobs:
# needs: test
name: Build and deploy
steps:
- name: Checkout
uses: actions/checkout@v3
with:
persist-credentials: false

- name: Tag name
id: tag_name
run: |
if [ '${{ inputs.tag }}' = '' ]; then
echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
else
echo "TAG=$TAG" >> $GITHUB_OUTPUT
fi
env:
TAG: ${{ inputs.tag }}

- name: Build prod image
uses: lidofinance/dispatch-workflow@v1
env:
APP_ID: ${{ secrets.APP_ID }}
APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
TARGET_REPO: "lidofinance/infra-mainnet"
TAG: "${{ steps.tag_name.outputs.TAG }}"
TAG: "${{ github.event.release.tag_name }}"
TARGET_WORKFLOW: "build_mainnet_dao_voting_ui.yaml"
46 changes: 0 additions & 46 deletions .github/workflows/create-tag-and-trigger-deploy.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/prepare-release-draft.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Prepare release draft
on:
push:
branches:
- main

permissions:
contents: write

jobs:
prepare-release-draft:
uses: lidofinance/actions/.github/workflows/prepare-release-draft.yml@main
with:
target: main
46 changes: 0 additions & 46 deletions .github/workflows/prepare-release.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# This file is no longer used by semantic-release
For the latest release notes, please see the [GitHub releases page](https://github.com/lidofinance/dao-voting-ui/releases).


## [0.12.1](https://github.com/lidofinance/dao-voting-ui/compare/0.12.0...0.12.1) (2023-04-06)


Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV BASE_PATH=$BASE_PATH
ENV NEXT_TELEMETRY_DISABLED=1

WORKDIR /app
RUN apk add --no-cache curl=~7
RUN apk add --no-cache curl=~8
COPY --from=build /app /app

RUN mkdir -p /app/.next/cache/images && chown -R node:node /app/.next/cache/images
Expand Down
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ https://www.notion.so/Custom-voting-UI-feature-description-bde7fde42d3749a3afcba
- Node.js v12+
- Yarn package manager

This project requires an .env file which is distributed via private communication channels. A sample can be found in .env.sample
This project requires an .env file which is distributed via private communication channels. A sample can be found in .env.sample.

## Development

Expand Down Expand Up @@ -81,12 +81,10 @@ yarn build && yarn start

## Release flow

To create new release:
To create a new release:

1. Merge all changes to the `main` branch
1. Navigate to Repo => Actions
1. Run action "Prepare release" action against `main` branch
1. When action execution is finished, navigate to Repo => Pull requests
1. Find pull request named "chore(release): X.X.X" review and merge it with "Rebase and merge" (or "Squash and merge")
1. After merge release action will be triggered automatically
1. Navigate to Repo => Actions and see last actions logs for further details
1. Merge all changes to the `main` branch.
1. After the merge, the `Prepare release draft` action will run automatically. When the action is complete, a release draft is created.
1. When you need to release, go to Repo → Releases.
1. Publish the desired release draft manually by clicking the edit button - this release is now the `Latest Published`.
1. After publication, the action to create a release bump will be triggered automatically.

0 comments on commit 8c86fa1

Please sign in to comment.