Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
eliofery committed Jan 28, 2025
1 parent cff12fa commit 8588075
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 25 deletions.
28 changes: 5 additions & 23 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: NodeJS with Gulp

on:
push:
branches: ['main', 'futuretech']
branches: ['futuretech']
pull_request:
branches: ['main', 'futuretech']
branches: ['futuretech']

jobs:
build:
Expand All @@ -27,34 +27,16 @@ jobs:
sudo apt-get update
sudo apt-get install -y imagemagick graphicsmagick
- name: Build for main branch
if: github.ref == 'refs/heads/main'
run: |
npm ci
lint-staged
npm run build
echo "Build for main completed"
- name: Deploy to GitHub Pages (main)
if: github.ref == 'refs/heads/main'
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: ./build
branch: gh-pages
target_folder: main

- name: Build for futuretech branch
if: github.ref == 'refs/heads/futuretech'
run: |
npm ci
lint-staged
yarn install --frozen-lockfile --ignore-engines
yarn lint-staged
npm run build
echo "Build for futuretech completed"
- name: Deploy to GitHub Pages (futuretech)
if: github.ref == 'refs/heads/futuretech'
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: ./build
branch: gh-pages
target_folder: futuretech
target-folder: futuretech
4 changes: 2 additions & 2 deletions src/markup/_config.pug
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
//- Актуально если сборка отправляется в github pages
//- gulp-template - имя репозитория, который отправляется в github page
//- Раскомментируйте условие и измените ссылку на свою
//- - if (env === "prod")
//- - baseUrl = "/gulp-template/";
- if (env === "prod")
- baseUrl = "/gulp-template/futuretech/";

0 comments on commit 8588075

Please sign in to comment.