Compare commits
No commits in common. "main" and "125458693edfdb8cf746ae6029e96457d7fa0c4c" have entirely different histories.
main
...
125458693e
|
@ -0,0 +1,44 @@
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: compliance
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- pull_request
|
||||||
|
steps:
|
||||||
|
- name: build
|
||||||
|
pull: always
|
||||||
|
image: node:14
|
||||||
|
commands:
|
||||||
|
- npm install
|
||||||
|
- npm run build
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: release
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- push
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
steps:
|
||||||
|
- name: build
|
||||||
|
pull: always
|
||||||
|
image: node:14
|
||||||
|
commands:
|
||||||
|
- npm install
|
||||||
|
- npm run build
|
||||||
|
- name: archive
|
||||||
|
pull: always
|
||||||
|
image: jolheiser/drone-arc:latest
|
||||||
|
settings:
|
||||||
|
files:
|
||||||
|
- "dist/*"
|
||||||
|
output: dist.tar.gz
|
||||||
|
- name: gitea-release
|
||||||
|
pull: always
|
||||||
|
image: jolheiser/drone-gitea-main:latest
|
||||||
|
settings:
|
||||||
|
token:
|
||||||
|
from_secret: gitea_token
|
||||||
|
base: https://git.birbmc.com
|
||||||
|
files:
|
||||||
|
- "dist.tar.gz"
|
|
@ -9,6 +9,4 @@ src/assets/webfonts/fa*
|
||||||
dist/
|
dist/
|
||||||
|
|
||||||
# Node
|
# Node
|
||||||
node_modules/
|
node_modules/
|
||||||
# Local Netlify folder
|
|
||||||
.netlify
|
|
|
@ -1,42 +0,0 @@
|
||||||
clone:
|
|
||||||
git:
|
|
||||||
image: woodpeckerci/plugin-git:next
|
|
||||||
|
|
||||||
pipeline:
|
|
||||||
compliance:
|
|
||||||
image: node:14
|
|
||||||
commands:
|
|
||||||
- npm install
|
|
||||||
- npm run build
|
|
||||||
when:
|
|
||||||
event: [pull_request]
|
|
||||||
netlify:
|
|
||||||
image: node:14
|
|
||||||
secrets:
|
|
||||||
- bot_token
|
|
||||||
- netlify_site_id
|
|
||||||
- netlify_auth_token
|
|
||||||
commands:
|
|
||||||
- node netlify.js
|
|
||||||
when:
|
|
||||||
event: [pull_request]
|
|
||||||
archive:
|
|
||||||
image: jolheiser/drone-arc:latest
|
|
||||||
when:
|
|
||||||
event: push
|
|
||||||
branch: main
|
|
||||||
settings:
|
|
||||||
files:
|
|
||||||
- "dist/*"
|
|
||||||
output: dist.tar.gz
|
|
||||||
release:
|
|
||||||
image: jolheiser/drone-gitea-main:latest
|
|
||||||
when:
|
|
||||||
event: push
|
|
||||||
branch: main
|
|
||||||
settings:
|
|
||||||
token:
|
|
||||||
from_secret: gitea_token
|
|
||||||
base: https://git.jojodev.com
|
|
||||||
files:
|
|
||||||
- "dist.tar.gz"
|
|
|
@ -5,7 +5,7 @@ rm -rf dist_bk/
|
||||||
cp -r dist/ dist_bk/
|
cp -r dist/ dist_bk/
|
||||||
|
|
||||||
# Get new dist
|
# Get new dist
|
||||||
wget https://git.jojodev.com/Minecraft/website/releases/download/latest/dist.tar.gz
|
wget https://git.birbmc.com/BirbMC/birbmc.com/releases/download/latest/dist.tar.gz
|
||||||
|
|
||||||
# Replace existing dist with new dist
|
# Replace existing dist with new dist
|
||||||
rm -rf dist/
|
rm -rf dist/
|
||||||
|
|
71
netlify.js
71
netlify.js
|
@ -1,71 +0,0 @@
|
||||||
const slugify = require('slugify')
|
|
||||||
const {exec} = require('child_process')
|
|
||||||
const axios = require('axios')
|
|
||||||
|
|
||||||
const siteId = process.env.NETLIFY_SITE_ID
|
|
||||||
const branchSlug = slugify(process.env.DRONE_SOURCE_BRANCH)
|
|
||||||
const prNumber = process.env.CI_PULL_REQUEST
|
|
||||||
|
|
||||||
const alias = `${prNumber}-${branchSlug}`
|
|
||||||
|
|
||||||
const promiseExec = cmd => {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
exec(cmd, (error, stdout, stderr) => {
|
|
||||||
if (error) {
|
|
||||||
reject(error)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
resolve(stdout)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
(async function () {
|
|
||||||
let stdout = await promiseExec(`./node_modules/.bin/netlify link --id ${siteId}`)
|
|
||||||
console.log(stdout)
|
|
||||||
stdout = await promiseExec(`./node_modules/.bin/netlify deploy --alias ${alias}`)
|
|
||||||
console.log(stdout)
|
|
||||||
})()
|
|
||||||
|
|
||||||
|
|
||||||
// We need the user id of the bot to prevent multiple comments as the PR gets updated
|
|
||||||
const BOT_USER_ID = 8
|
|
||||||
// The gitea token from the pipeline settings
|
|
||||||
const giteaToken = process.env.BOT_TOKEN
|
|
||||||
// The second, hard coded part of this url is something you need to set in Netlify's site settings.
|
|
||||||
const fullPreviewUrl = `https://${alias}--canopymc.netlify.app`
|
|
||||||
|
|
||||||
const prIssueCommentsUrl = `https://git.jojodev.com/api/v1/repos/Canopy/website/issues/${prNumber}/comments`;
|
|
||||||
|
|
||||||
(async function () {
|
|
||||||
|
|
||||||
// Here we get all comments through Gitea's API to see if there's already a comment from our bot
|
|
||||||
const {data} = await axios.get(prIssueCommentsUrl)
|
|
||||||
const hasComment = data.some(c => c.user.id === BOT_USER_ID)
|
|
||||||
|
|
||||||
if (hasComment) {
|
|
||||||
console.log(`PR #${prNumber} already has a comment with a link, not sending another comment.`)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Once we arrive here we know for sure there's no other comment yet. That means we can proceed to post one.
|
|
||||||
await axios.post(prIssueCommentsUrl, {
|
|
||||||
body: `
|
|
||||||
Hi ${process.env.CI_COMMIT_AUTHOR}!
|
|
||||||
|
|
||||||
Thank you for creating a PR!
|
|
||||||
|
|
||||||
[I've deployed a preview of the changes here.](${fullPreviewUrl})
|
|
||||||
|
|
||||||
> Beep boop, I'm a bot. :robot:
|
|
||||||
`,
|
|
||||||
}, {
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'accept': 'application/json',
|
|
||||||
'Authorization': `token ${giteaToken}`,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
console.log(`Preview comment sent successfully to PR #${prNumber}!`)
|
|
||||||
})()
|
|
11
netlify.toml
11
netlify.toml
|
@ -1,11 +0,0 @@
|
||||||
[build]
|
|
||||||
command = "npm build"
|
|
||||||
publish = "dist"
|
|
||||||
|
|
||||||
[[headers]]
|
|
||||||
for = "/*"
|
|
||||||
[headers.values]
|
|
||||||
X-Frame-Options = "DENY"
|
|
||||||
X-XSS-Protection = "1; mode=block"
|
|
||||||
X-Robots-Tag = "noindex"
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -18,16 +18,12 @@
|
||||||
"url": "https://git.jojodev.com/Canopy/canopymc.net.git"
|
"url": "https://git.jojodev.com/Canopy/canopymc.net.git"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "MIT",
|
"license": "IST",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@fortawesome/fontawesome-free": "^5.15.1",
|
"@fortawesome/fontawesome-free": "^5.15.1",
|
||||||
"copyfiles": "^2.4.0",
|
"copyfiles": "^2.4.0",
|
||||||
"dart-sass": "^1.25.0",
|
"dart-sass": "^1.25.0",
|
||||||
"front-matter": "^4.0.2",
|
"front-matter": "^4.0.2",
|
||||||
"showdown": "^1.9.1",
|
"showdown": "^1.9.1"
|
||||||
"slugify": "^1.6.3",
|
|
||||||
"axios": "^0.24.0",
|
|
||||||
"netlify": "^10.0.0",
|
|
||||||
"netlify-cli": "^8.0.19"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,5 +95,5 @@ $fa-font-path: "../webfonts";
|
||||||
@import "layout/footer";
|
@import "layout/footer";
|
||||||
@import "layout/wrapper";
|
@import "layout/wrapper";
|
||||||
|
|
||||||
// CanopyMC
|
// BirbMC
|
||||||
@import "canopymc";
|
@import "birbmc";
|
||||||
|
|
|
@ -106,9 +106,9 @@
|
||||||
<span class="icon solid major style4 fa-server"></span>
|
<span class="icon solid major style4 fa-server"></span>
|
||||||
<h3>Dedicated Server</h3>
|
<h3>Dedicated Server</h3>
|
||||||
<p>
|
<p>
|
||||||
Intel Xeon-E 2386G - 6c/ 12 t - 3.5GHz / 4.7GHz with 64 GB of RAM
|
Intel i7-7700K (4c/8t at 4.2+GHz) with 64GB of RAM and dual
|
||||||
950GB NVMe SSDs in RAID - full specification
|
450GB NVMe SSDs in RAID - full specification
|
||||||
<a href="https://us.ovhcloud.com/bare-metal/advance/adv-1/"
|
<a href="https://www.ovhcloud.com/en/bare-metal/rise/rise-2/"
|
||||||
>here.</a
|
>here.</a
|
||||||
>
|
>
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
<!-- Footer -->
|
<!-- Footer -->
|
||||||
<footer id="footer">
|
<footer id="footer">
|
||||||
<p class="copyright">
|
<p class="copyright">
|
||||||
© CanopyMC. Design: <a href="https://html5up.net">HTML5 UP</a>.
|
© BirbMC. Design: <a href="https://html5up.net">HTML5 UP</a>.
|
||||||
</p>
|
</p>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue