Skip to content

Commit

Permalink
fix build & deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
ewangler committed Nov 18, 2023
1 parent 5b46eb4 commit e44ce58
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 29 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
branches: [ main ]
# Allows you to run this workflow manually from the Actions tab on GitHub.
workflow_dispatch:
pull_request:
types: [opened, synchronize, reopened]

# Allow this job to clone the repo and create a page deployment
permissions:
Expand All @@ -23,13 +25,13 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'yarn'
node-version: 20
cache: 'npm'
- name: Install and build astro
shell: 'bash'
run: |
yarn
yarn build
npm install
npm run build
# - name: Install, build, and upload your site
# uses: withastro/action@v0
# with:
Expand All @@ -48,7 +50,7 @@ jobs:
run: npx tinacms build
- name: Copy TinaCMS artifacts
run: |
cp -R ./backend/public/it-landscape/admin/ ./dist/
cp -R ./public/it-landscape/admin/ ./dist/
rm ./dist/admin/.gitignore
- name: Create Pages Artifact
uses: actions/upload-pages-artifact@v1
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/pr-open.yml

This file was deleted.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"private": true,
"scripts": {
"dev": "tinacms dev -c \"next dev & astro dev\"",
"tina": "tinacms dev -c \"next dev & astro dev\"",
"build": "tinacms build && next build",
"start": "tinacms build && next start",
"lint": "next lint"
Expand Down

0 comments on commit e44ce58

Please sign in to comment.