Skip to content

Commit

Permalink
Merge pull request #235 from consensusnetworks/develop
Browse files Browse the repository at this point in the history
Promote develop to master
  • Loading branch information
shanejearley authored Jan 12, 2023
2 parents 6e0d9ae + c309065 commit fdacded
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
16 changes: 15 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Release
on:
push:
branches: [master]
tags: [v*]

env:
Expand Down Expand Up @@ -45,6 +44,21 @@ jobs:
- name: Deploy cdk infrastructure
run: npm run deploy

- name: Sync new version with develop
if: ${{ github.actor != 'nektos/act' }}
run: |
git config --global user.name 'robosupport'
git config --global user.email '[email protected]'
git fetch --no-recurse-submodules
git checkout $TARGET_BRANCH
git checkout ${GITHUB_REF##*/} -- package.json package-lock.json CHANGELOG.md
git add -A
git diff-index --quiet HEAD || git commit -am "Sync released version files (skip deploy)"
git push origin $TARGET_BRANCH
env:
TARGET_BRANCH: develop


- name: Select success emoji
if: ${{ success() }}
run: echo 'EMOJI=:rocket:' >> $GITHUB_ENV
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

# Casimir

[![GitHub discussions](https://consensusnetworks-shields.herokuapp.com/github/discussions/consensusnetworks/casimir)](https://github.com/consensusnetworks/casimir/discussions)
[![GitHub issues](https://consensusnetworks-shields.herokuapp.com/github/issues/consensusnetworks/casimir)](https://github.com/consensusnetworks/casimir/issues)
[![GitHub milestones](https://consensusnetworks-shields.herokuapp.com/github/milestones/all/consensusnetworks/casimir)](https://github.com/consensusnetworks/casimir/milestones)
[![Discord](https://consensusnetworks-shields.herokuapp.com/discord/976524855279226880?logo=discord)](https://discord.com/invite/Vy2b3gSZx8)
[![GitHub discussions](https://img.shields.io/github/discussions/consensusnetworks/casimir)](https://github.com/consensusnetworks/casimir/discussions)
[![GitHub issues](https://img.shields.io/github/issues/consensusnetworks/casimir)](https://github.com/consensusnetworks/casimir/issues)
[![GitHub milestones](https://img.shields.io/github/milestones/all/consensusnetworks/casimir)](https://github.com/consensusnetworks/casimir/milestones)
[![Discord](https://img.shields.io/discord/976524855279226880?logo=discord)](https://discord.com/invite/Vy2b3gSZx8)

> Decentralized staking and asset management
Expand Down
2 changes: 1 addition & 1 deletion apps/landing/src/components/nav/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
class="w-full h-[120px] overflow-hidden side-anim"
>
<h3 class="font-medium text-white mb-[25px] nav-xsm:text-[24px] nav-xsm:leading-[30px] nav-xsm:font-semibold">
Why are we building Casimir
Why We're Building Casimir
</h3>
<h5 class="text-blue_1 font-light nav-xsm:text-[16px] nav-xsm:leading-[20px]">
Written by Nathan Miller
Expand Down
3 changes: 0 additions & 3 deletions apps/landing/src/pages/whitepaper/Whitepaper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
</p>
</div>
<div class="px-margins">
<h4 class="text-grey_3 font-bold my-[35px]">
Why we're building Casimir
</h4>
<p class="text-justify leading-7 my-[20px] tracking-wide">
It’s always a good idea to revisit your priorities and values
especially in this time of uncertainty in blockchain, cryptocurrency,
Expand Down
5 changes: 3 additions & 2 deletions infrastructure/cdk/lib/landing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as route53targets from 'aws-cdk-lib/aws-route53-targets'
import * as route53 from 'aws-cdk-lib/aws-route53'
import { Bucket, BucketAccessControl } from 'aws-cdk-lib/aws-s3'
import { BucketDeployment, Source } from 'aws-cdk-lib/aws-s3-deployment'
import { Distribution, OriginAccessIdentity } from 'aws-cdk-lib/aws-cloudfront'
import { Distribution, OriginAccessIdentity, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront'
import { S3Origin } from 'aws-cdk-lib/aws-cloudfront-origins'

export interface LandingStackProps extends StackProps {
Expand Down Expand Up @@ -86,7 +86,8 @@ export class LandingStack extends Stack {
}
],
defaultBehavior: {
origin: new S3Origin(bucket, { originAccessIdentity }),
viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
origin: new S3Origin(bucket, { originAccessIdentity })
},
domainNames: [serviceDomain, [dnsRecords.landing, serviceDomain].join('.')],
certificate
Expand Down

0 comments on commit fdacded

Please sign in to comment.