Skip to content

Commit

Permalink
Merge pull request #178 from xen0n/bump-yarn-and-ci
Browse files Browse the repository at this point in the history
Upgrade to Yarn Modern and bump GHA actions
  • Loading branch information
xen0n authored Apr 21, 2024
2 parents 4fcea45 + 64c4f59 commit 2337c8b
Show file tree
Hide file tree
Showing 5 changed files with 14,011 additions and 10,065 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/.yarn/releases/** binary
/.yarn/plugins/** binary
15 changes: 9 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,34 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- name: Enable Corepack
run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: 20
cache: yarn
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '>=1.21.0'
check-latest: true
cache-dependency-path: |
scripts/asmdb/go.sum
- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Build AWLY helpers
run: yarn build-helpers
- name: Build website
run: yarn build

- name: Upload pages artifacts
- name: Upload pages artifacts (Main branch)
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: './build/'
name: 'gh-pages-${{github.sha}}'

- name: Upload pages artifacts
- name: Upload pages artifacts (PR)
if: ${{ github.ref != 'refs/heads/main' }}
uses: actions/upload-artifact@v4
with:
Expand All @@ -52,12 +54,13 @@ jobs:
runs-on: ubuntu-latest
needs: build_and_upload
permissions:
actions: read
contents: read
pages: write
id-token: write
steps:
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v1
with:
Expand Down
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# plugin build artifacts
/src/**/*.js
# Yarn Modern files
# Zero-Install consumes too much space (~340MiB right now) so it is
# explicitly not used
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Dependencies
/node_modules
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
"build-helpers": "cd scripts/asmdb && go build -o ./gen-asmdb-data ./..."
},
"dependencies": {
"@ant-design/icons": "^5.3.6",
"@docusaurus/core": "^3.2.1",
"@docusaurus/plugin-client-redirects": "^3.2.1",
"@docusaurus/plugin-content-blog": "^3.2.1",
"@docusaurus/preset-classic": "^3.2.1",
"@docusaurus/theme-common": "^3.2.1",
"@docusaurus/theme-mermaid": "^3.2.1",
"@easyops-cn/docusaurus-search-local": "^0.38.1",
"@jsdevtools/rehype-url-inspector": "^2.0.2",
Expand All @@ -28,9 +31,11 @@
"@types/lodash": "^4.14.200",
"@types/react": "^18",
"antd": "^5",
"browserslist": "^4.23.0",
"clsx": "^1.2.1",
"glob": "^10.3.12",
"lodash": "^4.17.21",
"mdast-util-find-and-replace": "^3.0.1",
"prism-react-renderer": "^2.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -56,5 +61,6 @@
},
"engines": {
"node": ">=20"
}
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 2337c8b

Please sign in to comment.