FIX - updating workflow ci files

vuestorefront-community · Sep 10, 2024 · ca46032 · ca46032
1 parent 33022da
commit ca46032
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 28 deletions.
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -1,18 +1,3 @@
-<<<<<<< HEAD
-name: VSF Continuous Delivery
-
-on:
- workflow_dispatch:
- push:
- branches:
- - sdk-migration
-
-jobs:
- release-packages:
- name: "Release NPM Packages"
- uses: vuestorefront/integrations-github-workflows/.github/workflows/continuous-delivery.yml@develop
- secrets: inherit
-=======
 name: Release
 
 on:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,33 +4,20 @@ on:
  workflow_call:
  inputs:
  enterprise:
-<<<<<<< HEAD
  description: 'Flag to use enterprise registry'
-=======
- description: "Flag to use enterprise registry"
->>>>>>> origin/main
  type: boolean
  required: false
  default: false
 
  node_version:
-<<<<<<< HEAD
  description: 'Node versions to test'
-=======
- description: "Node versions to test"
->>>>>>> origin/main
  type: string
  required: false
  default: "['16']"
 
 defaults:
  run:
  shell: bash
-<<<<<<< HEAD
-
-=======
-
->>>>>>> origin/main
 env:
  GCP_PROJECT_ID: 81559754996
  GCP_PROJECT_NAME: sf-artifacts-prod