Skip to content

Commit

Permalink
Drop Codacy & Rename and combine github workflow actions (triplea-gam…
Browse files Browse the repository at this point in the history
…e#10779)

(1) Drops codacy - the static analysis is useful but in practice we tend
to ignore the codacy warnings. Usually PMD will pick up any problems that
codacy highlights, otherwise it is usually problems in existing code
that are flagged.

(2) Combine workflow actions together and organize them.
Static code checks are prefixed with 'check-*', testing tasks are prefixed with
'testing-*', and all on-merge-to-master release actions are now in 'do-release.yml'

Actions that are run on-demand, are now prefixed with 'run-*'
  • Loading branch information
DanVanAtta authored Jun 26, 2022
1 parent bc9a21a commit 9bcafcd
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 152 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Compatibility Tests
name: Checkstyle and Formatting
on: pull_request
jobs:
build:
Expand All @@ -10,6 +10,5 @@ jobs:
with:
distribution: temurin
java-version: 11
- name: Run Compatibility Tests
run: ./gradlew :smoke-testing:test

- name: Check Formatting and Checkstyle
run: ./gradlew spotlessCheck checkstyleMain checkstyleTest
18 changes: 18 additions & 0 deletions .github/workflows/check-code-convention.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Static Checks
on: pull_request
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run Code Convention Checks
run: .build/code-convention-checks/run
- name: Find Unused DbUnit Datasets
run: .build/find-unused-or-unmatched-tests/find-unused-dbunit-datasets
- name: Find Orphaned Tests
run: .build/find-unused-or-unmatched-tests/find-orphaned-tests
- name: Check Links are Valid
run: .build/check-links-and-yaml-syntax/check-links
- name: Validate YAML Formatting
run: ./gradlew validateYamls

18 changes: 0 additions & 18 deletions .github/workflows/check-formatting.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/check-links.yml

This file was deleted.

File renamed without changes.
10 changes: 0 additions & 10 deletions .github/workflows/check-yaml-syntax.yml

This file was deleted.

15 changes: 0 additions & 15 deletions .github/workflows/checkstyle.yml

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/codacy-analysis.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/code-convention-checks.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-map-summaries.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
name: Deploy Artifacts to Github Releases
name: Master Branch Release
on:
push:
branches:
- master
- release/*
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
build:
name: Build and upload installers
name: Master Branch Release Actions
runs-on: Ubuntu-20.04
steps:
- name: Checkout code
Expand Down Expand Up @@ -39,4 +38,19 @@ jobs:
prerelease: ${{ env.is_prerelease }}
commit: ${{ github.sha }}
token: ${{ secrets.GITHUB_TOKEN }}

- name: Update maps on website
run: .build/update-maps-on-website/run
env:
BUILD_NUMBER: ${{ github.run_number }}
PUSH_TO_WEBSITE_TOKEN: ${{ secrets.PUSH_TO_WEBSITE_TOKEN }}
- name: Run Ansible to Deploy
run: |
pip install ansible==2.9.13
cd infrastructure
echo "$ANSIBLE_VAULT_PASSWORD" > vault_password
# TODO: deploy to production temporarily disabled, need to be sure this is 'safe'
# and won't disconnect users or otherwise cause problems
echo "Deploy to production temporarily disabled"
echo ./run_ansible --environment production
env:
ANSIBLE_VAULT_PASSWORD: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
with:
distribution: temurin
java-version: 11
- name: Run Tests
run: ./gradlew :smoke-testing:test
- name: Run Smoke Tests
run: .build/smoke-testing/run

File renamed without changes.
12 changes: 0 additions & 12 deletions .github/workflows/verify-test-structure.yml

This file was deleted.

0 comments on commit 9bcafcd

Please sign in to comment.