Skip to content

Commit

Permalink
Merge pull request #95 from jfrog/improve-github-workflow
Browse files Browse the repository at this point in the history
Back port improvements & fixes from Artifactory provider
  • Loading branch information
alexhung authored Jun 11, 2024
2 parents bcabaee + ed68a70 commit fabefc7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 237 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
acceptance-tests-matrix:
name: ${{ matrix.cli }}
runs-on: ubuntu-latest
continue-on-error: true
continue-on-error: false
environment: development
strategy:
fail-fast: true
matrix:
cli: [terraform, tofu]
outputs:
tf_version: ${{ steps.debug_tf_version.outputs.version }}
tf_version: ${{ steps.install_terraform_cli.outputs.version }}
tofu_version: ${{ steps.install_opentofu_cli.outputs.version }}
artifactory_version: ${{ steps.run_artifactory_container.outputs.version }}
steps:
Expand Down Expand Up @@ -139,11 +139,11 @@ jobs:
cat sample.tf | sed -e "s/version =.*/version = \"${PROVIDER_VERSION}\"/g" > sample.tf.tmp
cp sample.tf.tmp sample.tf && rm sample.tf.tmp
TERRAFORM_CLI=${{ matrix.cli }} make install
- name: Dump Artifactory logs
uses: jwalton/gh-docker-logs@v2
if: failure()
with:
tail: '10000'
# - name: Dump Artifactory logs
# uses: jwalton/gh-docker-logs@v2
# if: failure()
# with:
# tail: '10000'
- name: Clean up Docker container
if: always()
run: docker stop artifactory
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
update-changelog:
runs-on: ubuntu-latest
needs: acceptance-tests-matrix
if: ${{ github.event_name == 'pull_request' && needs.acceptance-tests-matrix.result == 'success' }}
if: ${{ github.event_name == 'pull_request' }} && ${{ needs.acceptance-tests-matrix.result == 'success' }}
permissions:
contents: write
steps:
Expand Down
229 changes: 0 additions & 229 deletions .jfrog-pipelines/pr.yaml

This file was deleted.

0 comments on commit fabefc7

Please sign in to comment.