Skip to content

Commit

Permalink
Merge pull request #95 from vuestorefront-community/dev
Browse files Browse the repository at this point in the history
FIX - updating workflow ci files
  • Loading branch information
mattmaribojoc authored Sep 10, 2024
2 parents c132cec + ca46032 commit 15cb0e4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 15cb0e4

Please sign in to comment.