diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 5a8e53a..fe8af68 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -27,26 +27,6 @@ jobs: pip install black - name: Check formatting run: black . -l 79 --check - check-version: - name: Check version - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Fetch all history for all tags and branches - repository: ${{ github.event.pull_request.head.repo.full_name }} - ref: ${{ github.event.pull_request.head.ref }} - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3.12 - - name: Build changelog - run: pip install "yaml-changelog>=0.1.7" && make changelog - - name: Preview changelog update - run: ".github/get-changelog-diff.sh" - - name: Check version number has been properly updated - run: ".github/is-version-number-acceptable.sh" test: name: Build and test runs-on: ubuntu-latest diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index f22487f..7b61ed4 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -3,14 +3,13 @@ name: Push on: - workflow_run: - workflows: ["Update versioning"] - types: [completed] + push: + branches: + - main jobs: lint: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} name: Lint steps: - uses: actions/checkout@v4 @@ -27,7 +26,6 @@ jobs: test: name: Build and test runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -62,7 +60,6 @@ jobs: publish-to-pypi: name: Publish to PyPI runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -87,7 +84,6 @@ jobs: docker: name: Docker runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout repo uses: actions/checkout@v4 diff --git a/.github/workflows/update_versioning.yaml b/.github/workflows/update_versioning.yaml deleted file mode 100644 index 5244661..0000000 --- a/.github/workflows/update_versioning.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# This builds and pushes the changelog, then -# automatically runs push_2 using the new version number -# to allow for proper pushing to PyPI. - -# This script must run first and complete to allow for -# proper versioning. - -name: Update versioning - -on: - push: - branches: [main] - -jobs: - check-version: - name: Check version - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Fetch all history for all tags and branches - repository: ${{ github.event.pull_request.head.repo.full_name }} - ref: ${{ github.event.pull_request.head.ref }} - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3.12 - - name: Build changelog - run: pip install "yaml-changelog>=0.1.7" && make changelog - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3.12 - - name: Install package - run: make install - - name: Preview changelog update - run: ".github/get-changelog-diff.sh" - - name: Check version number has been properly updated - run: ".github/is-version-number-acceptable.sh" - - name: Update changelog - uses: EndBug/add-and-commit@v9 - with: - add: "." - committer_name: Github Actions[bot] - author_name: Github Actions[bot] - message: Update PolicyEngine UK data - github_token: ${{ secrets.POLICYENGINE_UK_DATA_GITHUB_TOKEN }} \ No newline at end of file