diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index 48603bd..0479b45 100644 --- a/.github/workflows/pr_ci.yml +++ b/.github/workflows/pr_ci.yml @@ -22,7 +22,6 @@ jobs: runs-on: ubuntu-latest outputs: validate_paths: ${{ steps.format.outputs.dir_diff }} - # plan_paths: ${{ steps.deps.outputs.examples }} steps: - name: checkout code uses: actions/checkout@v3 @@ -45,22 +44,6 @@ jobs: run: | echo "::set-output name=dir_diff::$(echo -n "$DIFFS" | sed -E "s/^(modules|examples)\/(.+)\/.*$/\1\/\2/" | tr '\n' ',')" - # - name: discover module->example dependencies - # id: deps - # env: - # DIFFS: ${{ steps.format.outputs.dir_diff }} - # shell: bash - # run: | - # if [ "$DIFFS" ]; then - # EXAMPLES_DISCOVERY=$(for M in $(echo "$DIFFS" | tr ',' '\n' | grep modules); do - # echo $(grep -rl "$M" examples/*/*.tf | sed -E "s/^(examples\/.*)\/.*$/\1/g") - # done | sort -u | awk NF) - - # EXAMPLES_COMBINED=$(echo "$(echo $EXAMPLES_DISCOVERY | tr ' ' ','),$DIFFS" | tr ',' '\n' | awk NF | grep examples | sort -u) - - # echo "::set-output name=examples::$(echo -n $EXAMPLES_COMBINED | jq -R -s -c 'split(" ")')" - # fi - validate: name: validate all changed modules @@ -72,45 +55,12 @@ jobs: paths: ${{ needs.tf_prereqs.outputs.validate_paths }} - # plan: - # name: '${{ matrix.path }}@${{ matrix.tf_version }}' - # needs: [tf_prereqs] - # if: ${{ needs.tf_prereqs.outputs.plan_paths != '' }} - # strategy: - # matrix: - # path: ${{ fromJson(needs.tf_prereqs.outputs.plan_paths) }} - # tf_version: - # # - '0.15' - # # - '1.0' - # # - '1.1' - # - '1.2' - # runs-on: ubuntu-latest - # permissions: - # contents: read - # id-token: write - # steps: - # - name: checkout code - # uses: actions/checkout@v3 - - # - name: run plan - # uses: ./.github/actions/tf_plan - # env: - # ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} - # ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - # ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} - # ARM_USE_OIDC: true - # with: - # path: ${{ matrix.path }} - # tf_version: ${{ matrix.tf_version }} - # # tf_version: '1.2' - branch_protection_junction: name: junction point for branch protection needs: - validate - pre-commit - checkov - # - plan if: always() permissions: actions: read diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index fffb980..1a93855 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -79,56 +79,12 @@ jobs: paths: ${{ needs.validate_prereqs.outputs.paths }} - # plan_prereqs: - # name: plan prerequisites - # needs: [validate] - # runs-on: ubuntu-latest - # outputs: - # paths: ${{ steps.paths.outputs.paths }} - # steps: - # - name: checkout code - # uses: actions/checkout@v3 - # - name: set outputs - # id: paths - # shell: bash - # run: | - # echo "::set-output name=paths::$(echo -n $(ls -d1 examples/*) | jq -R -s -c 'split(" ")')" - - - # plan: - # name: 'plan: ${{ matrix.path }}' - # needs: [plan_prereqs] - # if: ${{ needs.plan_prereqs.outputs.paths != '' }} - # strategy: - # matrix: - # path: ${{ fromJson(needs.plan_prereqs.outputs.paths) }} - # runs-on: ubuntu-latest - # permissions: - # contents: read - # id-token: write - # steps: - # - name: checkout code - # uses: actions/checkout@v3 - - # - name: run plan - # uses: ./.github/actions/tf_plan - # env: - # ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} - # ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - # ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} - # ARM_USE_OIDC: true - # with: - # path: ${{ matrix.path }} - # tf_version: '1.2' - - release: name: release sem version needs: - validate - checkov - pre-commit - # - plan runs-on: ubuntu-latest permissions: contents: write