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

chore(format): prettier format and pnpm update #26

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 25 additions & 25 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@ name: build-image
on:
push:
branches:
- 'main'
- "main"

jobs:
ci:
uses: ./.github/workflows/ci.yaml
build-image:
name: build image
runs-on: ubuntu-latest
needs: [ci] # require tests to pass before build runs
needs: [ci] # require tests to pass before build runs
steps:
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to the Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build astro image for amd64
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64
build-args: |
APP_ENV=production
push: true
tags: |
ghcr.io/${{ github.repository }}:latest
cache-from: type=gha
cache-to: type=gha,mode=max
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to the Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build astro image for amd64
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64
build-args: |
APP_ENV=production
push: true
tags: |
ghcr.io/${{ github.repository }}:latest
cache-from: type=gha
cache-to: type=gha,mode=max
26 changes: 13 additions & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ name: ci

on:
pull_request:
types: [ opened, reopened, synchronize, edited ]
types: [opened, reopened, synchronize, edited]
workflow_call:
workflow_dispatch:

jobs:
build-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build image for amd64 and arm64
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build image for amd64 and arm64
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
22 changes: 11 additions & 11 deletions .prettierrc.mjs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/** @type {import("prettier").Config} */
export default {
plugins: ["prettier-plugin-astro"],
tabWidth: 2,
useTabs: false,
overrides: [
{
files: "*.astro",
options: {
parser: "astro",
},
},
],
plugins: ["prettier-plugin-astro"],
tabWidth: 2,
useTabs: false,
overrides: [
{
files: "*.astro",
options: {
parser: "astro",
},
},
],
};
14 changes: 7 additions & 7 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// @ts-check
import { defineConfig } from 'astro/config';
import { defineConfig } from "astro/config";

import tailwind from '@astrojs/tailwind';
import tailwind from "@astrojs/tailwind";

import node from '@astrojs/node';
import node from "@astrojs/node";

// https://astro.build/config
export default defineConfig({
integrations: [tailwind()],
output: 'server',
output: "server",

adapter: node({
mode: 'standalone'
})
});
mode: "standalone",
}),
});
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "",
"name": "tgno-frontend",
"type": "module",
"version": "0.0.1",
"scripts": {
Expand All @@ -14,7 +14,7 @@
"@astrojs/node": "^8.3.4",
"@astrojs/tailwind": "^5.1.1",
"@tailwindcss/typography": "^0.5.15",
"astro": "^4.15.11",
"astro": "^4.15.12",
"dompurify": "^3.1.7",
"jsdom": "^25.0.1",
"tailwindcss": "^3.4.13",
Expand Down
Loading