Skip to content

Commit ee08391

Browse files
committed
21.5 beta: rework workflows
1 parent b5a2381 commit ee08391

6 files changed

Lines changed: 34 additions & 51 deletions

File tree

.github/workflows/deploy-merge.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: deploy on merge
2+
'on':
3+
push:
4+
branches:
5+
- main
6+
- beta
7+
jobs:
8+
build_and_deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: 🚚 checkout code
12+
uses: actions/checkout@v3
13+
- name: 🍱 download packages
14+
uses: awalsh128/cache-apt-pkgs-action@latest
15+
with:
16+
packages: git ruby nodejs pnpm
17+
version: 1.0
18+
- name: 📦 install dependencies and build
19+
run: pnpm install --frozen-lockfile && pnpm build
20+
- name: 🚀 deploy to firebase
21+
uses: FirebaseExtended/action-hosting-deploy@v0
22+
with:
23+
repoToken: '${{ secrets.GITHUB_TOKEN }}'
24+
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_MIER_F6277 }}'
25+
channelId: ${{ github.ref == 'refs/heads/main' && 'live' || 'beta' }}
26+
projectId: mier-f6277
27+
- name: 🏎️ trigger speedlify deploy
28+
run: 'curl -X POST -d "{}" -H "Content-Type: application/x-www-form-urlencoded" "https://api.netlify.com/build_hooks/${{ secrets.NETLIFY_HOOK }}"'

.github/workflows/firebase-hosting-pull-request.yml renamed to .github/workflows/deploy-pull-request.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
# This file was auto-generated by the Firebase CLI
2-
# https://github.com/firebase/firebase-tools
3-
4-
name: Deploy to Firebase Hosting on PR
1+
name: deploy on PR
52
'on': pull_request
63
jobs:
74
build_and_preview:
85
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
96
runs-on: ubuntu-latest
107
steps:
118
- uses: actions/checkout@v3
12-
- run: npm ci && npm run build
9+
- run: pnpm install --frozen-lockfile && pnpm build
1310
- uses: FirebaseExtended/action-hosting-deploy@v0
1411
with:
1512
repoToken: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/firebase-hosting-beta.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/firebase-hosting-merge.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/static/css/index.sass

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,11 @@ video#background
255255
.project-img
256256
position: relative
257257
display: inline-block
258+
height: 15vw
258259

259260
img
260261
width: 100%
262+
height: 100%
261263
transition: opacity .3s ease-in-out
262264
border-radius: 5px
263265

0 commit comments

Comments
 (0)