Compare commits

..

No commits in common. "ee1c6ad31b0a88f1f41a01e000d8aaca1dbdcb44" and "6d34c9cda2695ac8da0492f62a20b01a75ba8542" have entirely different histories.

5 changed files with 3 additions and 51 deletions

View File

View File

@ -1,8 +1,9 @@
name: Deploy Account name: deploy account
on: on:
push: push:
branches: branches:
- master - master
- dev
paths: paths:
- "account/**" - "account/**"
- ".github/workflows/deploy-account.yml" - ".github/workflows/deploy-account.yml"

View File

@ -1,45 +0,0 @@
name: Deploy Functions
on:
push:
branches:
- master
paths:
- "functions/**"
- ".github/workflows/deploy-functions.yml"
workflow_dispatch:
jobs:
aws_cdk:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
- name: Install AWS CDK
run: npm install -g aws-cdk
- name: CDK Deploy
run: |
npm install
cd website
npm install
cd ../account
npm install
cd ../functions
npm install
cdk deploy --require-approval never
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
LINGDOCS_DICTIONARY_SPREADSHEET: ${{ secrets.LINGDOCS_DICTIONARY_SPREADSHEET }}
LINGDOCS_DICTIONARY_SHEET_ID: ${{ secrets.LINGDOCS_DICTIONARY_SHEET_ID }}
LINGDOCS_SERVICE_ACCOUNT_EMAIL: ${{ secrets.LINGDOCS_SERVICE_ACCOUNT_EMAIL }}
LINGDOCS_SERVICE_ACCOUNT_KEY: ${{ secrets.LINGDOCS_SERVICE_ACCOUNT_KEY }}
DICT_R2_ENDPOINT: ${{ secrets.DICT_R2_ENDPOINT }}
DICT_R2_KEY_ID: ${{ secrets.DICT_R2_KEY_ID }}
DICT_R2_KEY_SECRET: ${{ secrets.DICT_R2_KEY_SECRET }}
DICT_R2_BUCKET: ${{ secrets.DICT_R2_BUCKET }}

View File

@ -2,8 +2,6 @@ import { Context } from "hono";
import { env } from "hono/adapter"; import { env } from "hono/adapter";
export type FEnvironment = { export type FEnvironment = {
// AWS_ACCESS_KEY_ID: string;
// AWS_SECRET_ACCESS_KEY: string;
LINGDOCS_DICTIONARY_SPREADSHEET: string; LINGDOCS_DICTIONARY_SPREADSHEET: string;
LINGDOCS_DICTIONARY_SHEET_ID: string; LINGDOCS_DICTIONARY_SHEET_ID: string;
LINGDOCS_SERVICE_ACCOUNT_EMAIL: string; LINGDOCS_SERVICE_ACCOUNT_EMAIL: string;
@ -15,8 +13,6 @@ export type FEnvironment = {
}; };
export const environment: FEnvironment = { export const environment: FEnvironment = {
// AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID || "",
// AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || "",
LINGDOCS_DICTIONARY_SPREADSHEET: LINGDOCS_DICTIONARY_SPREADSHEET:
process.env.LINGDOCS_DICTIONARY_SPREADSHEET || "", process.env.LINGDOCS_DICTIONARY_SPREADSHEET || "",
LINGDOCS_DICTIONARY_SHEET_ID: process.env.LINGDOCS_DICTIONARY_SHEET_ID || "", LINGDOCS_DICTIONARY_SHEET_ID: process.env.LINGDOCS_DICTIONARY_SHEET_ID || "",

View File

@ -7,7 +7,7 @@ export const dictionaryFilename = "dictionary";
export const dictionaryInfoFilename = "dictionary-info"; export const dictionaryInfoFilename = "dictionary-info";
// const hunspellAffFileFilename = "ps_AFF.aff"; // const hunspellAffFileFilename = "ps_AFF.aff";
// const hunspellDicFileFilename = "ps_AFF.dic"; // const hunspellDicFileFilename = "ps_AFF.dic";
// const allWordsJsonFilename = "all-words-dictionary.json"; const allWordsJsonFilename = "all-words-dictionary.json";
const url = `${baseUrl}${dictionaryFilename}`; const url = `${baseUrl}${dictionaryFilename}`;
const infoUrl = `${baseUrl}${dictionaryInfoFilename}`; const infoUrl = `${baseUrl}${dictionaryInfoFilename}`;