diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2d0600..082f1f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,7 +67,7 @@ jobs: deploy: # this job will only run on PUSH to MAIN on the repository the-openary/website-dev # In PR and forked repository (main) this job will be SKIPPED. -# if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'the-openary/website-dev' + # if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'the-openary/website-dev' if: false environment: name: github-pages diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 047204d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,38 +0,0 @@ -stages: - - build - -variables: - HUGO_ENV: production - HUGO_VERSION: "0.118.2" - GO_VERSION: "1.20.5" - NODE_VERSION: "18.16.1" - -cache: - paths: - - node_modules/ - -default: - image: node:${NODE_VERSION} - before_script: - - echo "USING NODE ${NODE_VERSION}" - - apt-get update && apt-get install -y curl - - curl -LO "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz" - - tar -xvf hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz - - mv hugo /usr/local/bin/ - - rm hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz - - echo "HUGO ${HUGO_VERSION} INSTALLED" - - curl -LO "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" - - tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz - - export PATH=$PATH:/usr/local/go/bin - - rm go${GO_VERSION}.linux-amd64.tar.gz - - echo "GO ${GO_VERSION} INSTALLED" - - npm install - -pages: - stage: build - script: - - npm run project-setup - - npm run build - artifacts: - paths: - - public diff --git a/amplify.yml b/amplify.yml deleted file mode 100644 index 67b79ec..0000000 --- a/amplify.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: 1 -frontend: - phases: - preBuild: - commands: - - yum install -y curl - - curl -LO "https://github.com/gohugoio/hugo/releases/download/v0.118.2/hugo_extended_0.118.2_Linux-64bit.tar.gz" - - tar -xvf hugo_extended_0.118.2_Linux-64bit.tar.gz - - mv hugo /usr/local/bin/ - - rm hugo_extended_0.118.2_Linux-64bit.tar.gz - - echo "HUGO 0.118.2 INSTALLED" - - curl -LO "https://dl.google.com/go/go1.20.5.linux-amd64.tar.gz" - - tar -C /usr/local -xzf go1.20.5.linux-amd64.tar.gz - - export PATH=$PATH:/usr/local/go/bin - - rm go1.20.5.linux-amd64.tar.gz - - echo "GO 1.20.5 INSTALLED" - - npm install - build: - commands: - - npm run project-setup - - npm run build - artifacts: - # IMPORTANT - Please verify your build output directory - baseDirectory: /public - files: - - "**/*" - cache: - paths: - - node_modules/**/* diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss index 59a5fcc..c699fa1 100644 --- a/assets/scss/custom.scss +++ b/assets/scss/custom.scss @@ -3,5 +3,5 @@ @import "fonts"; .pink-highlight { - color: #db79c1; -} \ No newline at end of file + color: #db79c1; +} diff --git a/content/english/blog/post-1.md b/content/english/blog/post-1.md index 56c9307..ba0dbae 100644 --- a/content/english/blog/post-1.md +++ b/content/english/blog/post-1.md @@ -9,4 +9,4 @@ tags: ["meta"] draft: false --- -Development is going to be slowed down for a couple weeks (till January 7th or so most likely). Super busy with life atm but after that point development should steamroll ahead. Thanks for your understanding. \ No newline at end of file +Development is going to be slowed down for a couple weeks (till January 7th or so most likely). Super busy with life atm but after that point development should steamroll ahead. Thanks for your understanding. diff --git a/content/english/pages/getting-started.md b/content/english/pages/getting-started.md index 152f088..3bcae84 100644 --- a/content/english/pages/getting-started.md +++ b/content/english/pages/getting-started.md @@ -12,7 +12,7 @@ Join the [Discord](https://discord.com/invite/VZFWGp7FHZ). It'll help a lot. ### Overview -Want to get involved? Great! Usually, this involves building one of our projects first. Heres an overview of each: +Want to get involved? Great! Usually, this involves building one of our projects first. Heres an overview of each: **Neutrino**: A cheap, portable 3D printer. Under $300 CAD. @@ -20,4 +20,4 @@ Want to get involved? Great! Usually, this involves building one of our project ### FAQ -WIP \ No newline at end of file +WIP diff --git a/content/english/pages/neutrino.md b/content/english/pages/neutrino.md index 6ebd81b..fd5fe36 100644 --- a/content/english/pages/neutrino.md +++ b/content/english/pages/neutrino.md @@ -8,4 +8,4 @@ description: "This is meta description" draft: false --- -### WIP, USE THE GITHUB REPOSITORY FOR NOW. LINK [HERE](https://github.com/the-openary/neutrino) \ No newline at end of file +### WIP, USE THE GITHUB REPOSITORY FOR NOW. LINK [HERE](https://github.com/the-openary/neutrino) diff --git a/netlify.toml b/netlify.toml deleted file mode 100644 index d659856..0000000 --- a/netlify.toml +++ /dev/null @@ -1,7 +0,0 @@ -[build] -publish = "public" -command = "yarn project-setup; yarn build" - -[build.environment] -HUGO_VERSION = "0.118.2" -GO_VERSION = "1.20.5" diff --git a/vercel-build.sh b/vercel-build.sh deleted file mode 100644 index 17138f0..0000000 --- a/vercel-build.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# default versions -NODE_VERSION='18.16.1'; -GO_VERSION='1.20.5'; -HUGO_VERSION='0.118.2'; - -# install Node.js -# echo "Installing Node.js $NODE_VERSION..." -# curl -sSOL https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}.tar.gz -# tar -xzf node-v${NODE_VERSION}.tar.gz -# export PATH=$PATH:/usr/local/bin -# rm -rf node-v${NODE_VERSION}.tar.gz - -echo "USING NODE VERSION: $(node -v)" - -# install Go -echo "Installing Go $GO_VERSION..." -curl -sSOL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz -export PATH=$PATH:/usr/local/go/bin -rm -rf go${GO_VERSION}.linux-amd64.tar.gz -go version - -# install Hugo -echo "Installing Hugo $HUGO_VERSION..." -curl -sSOL https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz -tar -xzf hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz -mv hugo /usr/local/bin/ -rm -rf hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz -hugo version - -# project setup -echo "Project setting up..." -npm run project-setup - -# install dependencies -echo "Installing project dependencies..." -npm install - -# run the build command -echo "Running the build command..." -npm run build diff --git a/vercel.json b/vercel.json deleted file mode 100644 index f19fd34..0000000 --- a/vercel.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "builds": [ - { - "src": "vercel-build.sh", - "use": "@vercel/static-build", - "config": { - "distDir": "public" - } - } - ] -}