diff --git a/.github/workflows/Build-Deploy-dev.yaml b/.github/workflows/Build-Deploy-dev.yaml index f86e9b4..130d6b9 100644 --- a/.github/workflows/Build-Deploy-dev.yaml +++ b/.github/workflows/Build-Deploy-dev.yaml @@ -2,8 +2,7 @@ name: DEV Build-and-Deploy CI/CD on: push: - # branches: [ 'dev' ] - branches: '**' + branches: [ 'dev' ] workflow_dispatch: @@ -71,8 +70,6 @@ jobs: docker push $ECR_REGISTRY/$ECR_REPOSITORY:dev-$DATE docker push $ECR_REGISTRY/$ECR_REPOSITORY:dev-latest - echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:dev-$DATE" - # - name: Build, tag, and push server-main image to Amazon ECR # if: contains(github.ref, 'main') # id: build-image @@ -86,8 +83,6 @@ jobs: # docker push $ECR_REGISTRY/$ECR_REPOSITORY:main-$DATE # docker push $ECR_REGISTRY/$ECR_REPOSITORY:main-latest - # echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:main-$DATE" - deploy: needs: build runs-on: ubuntu-latest @@ -116,4 +111,4 @@ jobs: # script: | # docker pull $ECR_REGISTRY/$ECR_REPOSITORY:main-latest # docker stop $ECR_REPOSITORY - # docker run --rm -p 8080:8080 --name kumo-server $ECR_REGISTRY/$ECR_REPOSITORY:main-latest \ No newline at end of file + # docker run --rm -d -p 8080:8080 --name kumo-server $ECR_REGISTRY/$ECR_REPOSITORY:main-latest \ No newline at end of file diff --git a/.github/workflows/Build-Test.yaml b/.github/workflows/Build-Test.yaml index 2c85767..6d0a480 100644 --- a/.github/workflows/Build-Test.yaml +++ b/.github/workflows/Build-Test.yaml @@ -1,8 +1,8 @@ -name: KUMO-SERVER-Build-Test-on-Push CI/CD +name: Build Test CI/CD on: - pull_request: - branches: ['main', 'dev'] + push: + branches: '**' jobs: build: