diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index b8779ca..5d5598b 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -11,11 +11,11 @@ on: required: true description: "Password for Docker registry" inputs: - Debug: + debug: required: false type: boolean default: false - Dockerfile: + dockerfile: required: false type: string default: ./Dockerfile @@ -42,7 +42,7 @@ jobs: - uses: rlespinasse/github-slug-action@v5 id: slug - name: debug info - if: ${{ inputs.Debug }} + if: ${{ inputs.debug }} run: | printenv - name: Set up Docker Buildx @@ -65,7 +65,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: ${{ inputs.Dockerfile }} + file: ${{ inputs.dockerfile }} push: true cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.github/workflows/test-argocd.yaml b/.github/workflows/test-argocd.yaml deleted file mode 100644 index daf37b1..0000000 --- a/.github/workflows/test-argocd.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: ArgoCD Deployment -run-name: ${{ github.actor }} run Actions 🚀 - -on: - - push - -jobs: - argocd: - uses: ./.github/workflows/argocd.yaml - with: - debug: true - secrets: - ARGOCD_GIT_TOKEN: ${{ secrets.ARGOCD_GIT_TOKEN }} - \ No newline at end of file diff --git a/.github/workflows/test-buil-docker.yaml b/.github/workflows/test-buil-docker.yaml deleted file mode 100644 index 4f22c54..0000000 --- a/.github/workflows/test-buil-docker.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: Docker Image CI -run-name: ${{ github.actor }} run Actions 🚀 - -on: - - push - -jobs: - docker: - uses: ./.github/workflows/docker.yaml - with: - registry: ${{ vars.REGISTERY_ADDRESS }} - secrets: - REGISTERY_USER: ${{ secrets.REGISTERY_USER }} - REGISTERY_PASSWORD: ${{ secrets.REGISTERY_PASSWORD }} diff --git a/.github/workflows/test-full.yaml b/.github/workflows/test-full.yaml index 137d94c..f830ea1 100644 --- a/.github/workflows/test-full.yaml +++ b/.github/workflows/test-full.yaml @@ -2,21 +2,40 @@ name: full CI run-name: ${{ github.actor }} run Actions 🚀 on: - - push + workflow_dispatch: + inputs: + run-docker: + description: 'Run Docker Build and Push' + required: false + default: true + type: boolean + run-argocd: + description: 'Run ArgoCD Deployment' + required: false + default: true + type: boolean + debug: + description: 'Enable debug mode for ArgoCD deployment' + required: false + default: true + type: boolean jobs: docker: + if: ${{ github.event.inputs.run-docker == true }} uses: ./.github/workflows/docker.yaml with: + debug: ${{ github.event.inputs.debug }} registry: ${{ vars.REGISTERY_ADDRESS }} secrets: REGISTERY_USER: ${{ secrets.REGISTERY_USER }} REGISTERY_PASSWORD: ${{ secrets.REGISTERY_PASSWORD }} argocd: + if: ${{ github.event.inputs.run-argocd == true }} uses: ./.github/workflows/argocd.yaml needs: docker with: - debug: true + debug: ${{ github.event.inputs.debug }} secrets: ARGOCD_GIT_TOKEN: ${{ secrets.ARGOCD_GIT_TOKEN }} \ No newline at end of file