Deploy to GitHub Pages from GitHub Actions

Author: nickserv

.github/workflows/CI.yml

@@ -2,21 +2,48 @@ name: CI
 
 on:
   push:
-    branches: [source, ci-test]
+    branches: [source]
 
   workflow_dispatch:
 
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
           node-version: 8
           cache: yarn
-      - run: yarn
-      - run: yarn deploy
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+      - name: Install dependencies
+        run: yarn
+      - name: Build with DocPad
+        run: yarn deploy
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: out
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

Gruntfile.js

@@ -3,7 +3,6 @@ module.exports = function (grunt) {
 
 	grunt.loadNpmTasks('grunt-contrib-clean');
 	grunt.loadNpmTasks('grunt-contrib-copy');
-	grunt.loadNpmTasks('grunt-gh-pages');
 
 	grunt.loadTasks('./tasks');
 
@@ -20,30 +19,6 @@ module.exports = function (grunt) {
 				dest: 'out/'
 			}
 		},
-		'gh-pages': {
-			options: {
-				base: 'out',
-				branch: 'master'
-			},
-			publish: {
-				options: {
-					repo: 'https://github.com/DefinitelyTyped/definitelytyped.github.io.git',
-					message: 'publish (cli)'
-				},
-				src: ['**']
-			},
-			deploy: {
-				options: {
-					repo: 'https://' + process.env.GITHUB_TOKEN + '@github.com/' + process.env.GITHUB_REPOSITORY + '.git',
-					message: 'publish (auto)',
-					user: {
-						name: 'dt-bot',
-						email: '[email protected]'
-					}
-				},
-				src: ['**']
-			}
-		},
 		docpad: {
 			options: require('./docpad'),
 			generate: {
@@ -61,18 +36,6 @@ module.exports = function (grunt) {
 		}
 	});
 
-	grunt.registerTask('check-deploy', function() {
-		this.requires(['build']);
-
-		if (process.env.GITHUB_ACTIONS === 'true' && process.env.GITHUB_REF === 'refs/heads/source') {
-			grunt.log.writeln('executing deployment');
-			grunt.task.run('gh-pages:deploy');
-		}
-		else {
-			grunt.log.writeln('skipping deployment');
-		}
-	});
-
 	//
 	grunt.registerTask('prep', 'Clean and prepare.', [
 		'clean:out',
@@ -95,15 +58,5 @@ module.exports = function (grunt) {
 		'copy:rootfiles'
 	]);
 
-	grunt.registerTask('publish', 'Build and push to master using CLI.', [
-		'build',
-		'gh-pages:publish'
-	]);
-
-	grunt.registerTask('deploy', 'Build with production env for bot.', [
-		'build',
-		'check-deploy'
-	]);
-
 	grunt.registerTask('default', ['build']);
 };

package.json

@@ -38,7 +38,6 @@
     "docpad-plugin-livereload": "^2.6.0",
     "grunt": "^1.0.1",
     "grunt-cli": "^1.2.0",
-    "grunt-gh-pages": "^2.0.0",
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-copy": "^1.0.0",
     "highlight.js": "^9.12.0",