mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-05-11 19:15:35 +02:00
solved merge conflict
This commit is contained in:
@@ -6,6 +6,10 @@ on:
|
||||
branches:
|
||||
- developer
|
||||
- main
|
||||
push:
|
||||
branches:
|
||||
- developer
|
||||
- main
|
||||
release:
|
||||
types:
|
||||
- published
|
||||
@@ -87,7 +91,7 @@ jobs:
|
||||
|
||||
|
||||
- name: Copy documentation and Release notes to versioned folder
|
||||
if: github.event_name == 'release' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
|
||||
if: github.event_name == 'release' || (github.event_name == 'push')
|
||||
run: |
|
||||
VERSION="${{ steps.version.outputs.version }}"
|
||||
mkdir -p "gh-pages/${VERSION}"
|
||||
@@ -99,7 +103,7 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Commit and Push changes to gh-pages
|
||||
if: github.event_name == 'release' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
|
||||
if: github.event_name == 'release' || (github.event_name == 'push')
|
||||
run: |
|
||||
cd gh-pages
|
||||
git config --global user.name 'github-actions'
|
||||
|
||||
Reference in New Issue
Block a user