fix

sk81biz · Oct 22, 2024 · 0b93247 · 0b93247
1 parent 5a86feb
commit 0b93247
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - 'master'
-      - 'develop'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -27,11 +26,6 @@ jobs:
         run: |
           echo ${{ github.ref }}
           echo "${GITHUB_REF_NAME}"
-<<<<<<< HEAD
-=======
-          PRODUCT_VERSION=$(echo "${{ matrix.branch }}" | sed '/^release\b\|^hotfix\b\|^feature\b/s/release.*\/\|hotfix.*\/\|feature.*\///; s/-git-action$//; s/^v//')
-          echo ${PRODUCT_VERSION}
->>>>>>> master
           if [ "${GITHUB_REF_NAME}" = "develop" ]; then 
              echo "Branch is ${GITHUB_REF_NAME}"
           fi

diff --git a/.github/workflows/learn-github-actions.yml b/.github/workflows/learn-github-actions.yml
diff --git a/.github/workflows/nodejs-demo.yml b/.github/workflows/nodejs-demo.yml
@@ -14,4 +14,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
-      - run: node --version
+      - run: node --version
+      - run: npm install -g bats
+      - run: bats -v