diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 91c34535..8e5eea09 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -21,8 +21,6 @@ jobs: node-version: 18.x - run: npm clean-install - - run: npm install -D 'https://gitpkg.now.sh/stramel/astro-icon/packages/core?main' - - run: npm install @iconify/json - name: Build run: npm run build @@ -32,4 +30,4 @@ jobs: if: github.ref == 'refs/heads/main' with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./dist + publish_dir: ./public diff --git a/.gitignore b/.gitignore index 8c36d95a..eccc2b57 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ pnpm-debug.log* .envrc cypress/videos cypress/screenshots +public/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3fa3fdb..fa0e6646 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,45 +1,22 @@ -variables: - GIT_SUBMODULE_STRATEGY: recursive +# The Docker image that will be used to build your app +image: node:lts -stages: - - build - - test - - deploy - - -build: - image: node:latest - script: - - npm ci --cache .npm --prefer-offline +pages: cache: - key: $CI_COMMIT_REF_SLUG paths: - - .npm/ - - -test: - image: registry.gitlab.com/pages/hugo/hugo_extended:latest - needs: [build] - before_script: - - apk add --update --no-cache git npm + - node_modules/ script: - # - hugo --enableGitInfo -b "https://jhilker.gitlab.io" - - npm ci --cache .npm --prefer-offline - - hugo --minify -b "https://jhilker.gitlab.io" - except: - - main + # Specify the steps involved to build your app here + - npm install + - npm run build -pages: - image: registry.gitlab.com/pages/hugo/hugo_extended:latest - needs: [build] - before_script: - - apk add --update --no-cache git npm - script: - # - hugo --enableGitInfo -b "https://jhilker.gitlab.io" - - npm ci --cache .npm --prefer-offline - - hugo --minify -b "https://jhilker.gitlab.io" artifacts: paths: + # The folder that contains the built files to be published. + # This must be called "public". - public + only: + # Trigger a new build and deploy only when there is a push to the + # branch(es) below - main diff --git a/astro.config.mjs b/astro.config.mjs index fc0aa31c..14fae007 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -11,6 +11,8 @@ import { rehypeAccessibleEmojis } from 'rehype-accessible-emojis'; // https://astro.build/config export default defineConfig({ site: "https://jhilker.com", + outDir: "public", + publicDir: "static", integrations: [mdx(), tailwind(), alpinejs()], markdown: { diff --git a/static/favicon.svg b/static/favicon.svg new file mode 100644 index 00000000..f157bd1c --- /dev/null +++ b/static/favicon.svg @@ -0,0 +1,9 @@ + + + +