diff --git a/.env.example b/.env.example index 58d419b..77ffbf9 100644 --- a/.env.example +++ b/.env.example @@ -3,7 +3,4 @@ PUBLIC_ALGOLIA_APP_ID=\w+ PUBLIC_ALGOLIA_SEARCH_KEY=\w+ SECRET_ALGOLIA_ADMIN_KEY=\w+ -SECRET_GITHUB_PERSONAL_ACCESS_TOKEN=\w+ -GITHUB_USER_NAME=\w+ -GITHUB_REPOSITORY_NAME=\w+ -GITHUB_REPOSITORY_EXPRESSION=HEAD:\w+/\w+.md +SECRET_GH_PAT=\w+ diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d9927e4..be23ae3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,8 +32,7 @@ jobs: npm run build env: MODE: production - SECRET_GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.SECRET_GITHUB_PERSONAL_ACCESS_TOKEN }} - PUBLIC_GA_MEASUREMENT_ID: ${{ secrets.GA_MEASUREMENT_ID }} + SECRET_GH_PAT: ${{ secrets.SECRET_GH_PAT }} PUBLIC_ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }} PUBLIC_ALGOLIA_SEARCH_KEY: ${{ secrets.ALGOLIA_SEARCH_KEY }} PUBLIC_ALGOLIA_INDEX_BLOG: ${{ secrets.ALGOLIA_INDEX_BLOG }} @@ -45,4 +44,4 @@ jobs: projectName: astro-site directory: dist # Optional: Enable this if you want to have GitHub Deployments triggered - # gitHubToken: ${{ secrets.GITHUB_TOKEN }} + # gitHubToken: ${{ secrets.SECRET_GH_PAT }} diff --git a/script/getGitHubRepositoryContent.mjs b/script/getGitHubRepositoryContent.mjs index ec051c0..31a637e 100644 --- a/script/getGitHubRepositoryContent.mjs +++ b/script/getGitHubRepositoryContent.mjs @@ -1,6 +1,7 @@ import { graphql, GraphqlResponseError } from '@octokit/graphql' import { format } from 'date-fns' import fs from 'fs-extra' +import siteConfig from 'site.config' /** * @param {string} birthdate '2020-01-01' @@ -74,10 +75,10 @@ async function fetchRepositoryContent(githubToken, owner, repo, expression) { } ;(async () => { - const token = process.env.SECRET_GITHUB_PERSONAL_ACCESS_TOKEN || '' - const owner = process.env.GITHUB_USER_NAME || '' - const repositoryName = process.env.GITHUB_REPOSITORY_NAME || '' - const repositoryExpression = process.env.GITHUB_REPOSITORY_EXPRESSION || '' + const token = process.env.SECRET_GH_PAT || ""; + const owner = siteConfig.github || '' + const repositoryName = siteConfig.docsGitHubRepositoryName || '' + const repositoryExpression = siteConfig.docsGitHubRepositoryExpression || '' if (!token || !owner || !repositoryName || !repositoryExpression) { return console.error('Env is Not Found.') diff --git a/script/getGitHubUserContent.mjs b/script/getGitHubUserContent.mjs index 5080aec..64aff7b 100644 --- a/script/getGitHubUserContent.mjs +++ b/script/getGitHubUserContent.mjs @@ -1,6 +1,7 @@ import { graphql, GraphqlResponseError } from '@octokit/graphql' import { subYears, startOfWeek, format } from 'date-fns' import fs from 'fs-extra' +import siteConfig from "../site.config" /** * @param {string} githubToken @@ -78,8 +79,8 @@ async function fetchUserContent(githubToken, owner, pinnedItemsNum, calendarFrom } ;(async () => { - const token = process.env.SECRET_GITHUB_PERSONAL_ACCESS_TOKEN || '' - const owner = process.env.GITHUB_USER_NAME || '' + const token = process.env.SECRET_GH_PAT || ""; + const owner = siteConfig.github || '' if (!token || !owner) { return console.log('Env is Not Found.') diff --git a/site.config.ts b/site.config.ts index 79f1124..0cc4b1c 100644 --- a/site.config.ts +++ b/site.config.ts @@ -3,6 +3,8 @@ export default { description: "My site description", siteRoot: import.meta.env.PROD ? "https://oriverk.dev" : "http://localhost:3000", github: 'oriverk', + docsGitHubRepositoryName: 'oriverk-docs', + docsGitHubRepositoryExpression: "HEAD:cv/index.md", zenn: 'oriverk', x: 'not_you_die', }