refactor: Some more CI consistency. (#406)

Author: pantierra

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
   integration-tests:
     name: Integration tests
     needs: fast-checks
-    if: github.event.pull_request.head.repo.full_name == github.repository
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -53,7 +53,7 @@ jobs:
           version: ${{ env.HELM_VERSION }}
 
       - name: Set release name
-        run: echo "RELEASE_NAME=eoapi-$(echo "${{ github.sha }}" | cut -c1-8)" >> "$GITHUB_ENV"
+        run: echo "RELEASE_NAME=eoapi-${GITHUB_SHA::8}" >> "$GITHUB_ENV"
 
       - name: Clean up disk space
         run: |

.github/workflows/pr.yaml

@@ -1,11 +1,11 @@
 name: PR Checks
+
 on:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
+    types: [opened, synchronize, reopened]
 
 jobs:
-  pr-title-and-changelog:
-    name: PR Validation
+  validate:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/release.yml

@@ -1,44 +1,43 @@
-name: release helm chart
+name: Release Helm Chart
 
 on:
   release:
-    types:
-      - published
+    types: [published]
 
 env:
   HELM_VERSION: v3.18.3
 
 jobs:
   release:
-    if: ${{ !startsWith(github.ref, 'refs/tags/eoapi-') }}  # prevent the helm chart releaser from running this release workflow
+    if: "!startsWith(github.ref, 'refs/tags/eoapi-')"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: configure git
+      - name: Configure git
         run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
 
       - uses: azure/setup-helm@v4
         with:
           version: ${{ env.HELM_VERSION }}
 
-      - name: add helm repos
+      - name: Add Helm repos
         run: |
           helm repo add eoapi https://devseed.com/eoapi-k8s/
           helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
           helm repo add grafana https://grafana.github.io/helm-charts
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo list
 
-      - name: run chart-releaser
+      - name: Run chart-releaser
         uses: helm/[email protected]
         with:
           charts_dir: charts
         env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CR_SKIP_EXISTING: true
           CR_INDEX_PATH: "."

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.8.1"
+  "charts/eoapi": "0.8.1"
 }

charts/eoapi/profiles/production.yaml

@@ -358,8 +358,8 @@ serviceAccount:
   create: true
   automount: true
   annotations: {}
-    # Add cloud provider annotations if needed
-    # eks.amazonaws.com/role-arn: arn:aws:iam::ACCOUNT:role/eoapi-role
+  # Add cloud provider annotations if needed
+  # eks.amazonaws.com/role-arn: arn:aws:iam::ACCOUNT:role/eoapi-role
 
 ######################
 # GENERAL SETTINGS

release-please-config.json

@@ -1,19 +1,20 @@
 {
   "packages": {
-    ".": {
+    "charts/eoapi": {
       "release-type": "helm",
-      "extra-files": [
-        {
-          "type": "yaml",
-          "path": "charts/eoapi/Chart.yaml",
-          "jsonpath": "$.version"
-        },
-        {
-          "type": "yaml",
-          "path": "charts/eoapi/Chart.yaml",
-          "jsonpath": "$.appVersion"
-        },
-        "charts/eoapi/README.md"
+      "extra-files": ["README.md"],
+      "changelog-sections": [
+        {"type": "feat", "section": "Added"},
+        {"type": "fix", "section": "Fixed"},
+        {"type": "refactor", "section": "Changed"},
+        {"type": "chore", "section": "Maintenance", "hidden": false},
+        {"type": "docs", "section": "Other", "hidden": false},
+        {"type": "test", "section": "Other", "hidden": false},
+        {"type": "ci", "section": "Other", "hidden": false},
+        {"type": "perf", "section": "Other", "hidden": false},
+        {"type": "build", "section": "Other", "hidden": false},
+        {"type": "style", "section": "Other", "hidden": false},
+        {"type": "revert", "section": "Other", "hidden": false}
       ]
     }
   }

tests/conftest.py

@@ -244,8 +244,6 @@ def get_pod_count(namespace: str, service_name: str) -> int:
         return 0
 
     pods = json.loads(result.stdout)
-    running_pods = [
-        pod for pod in pods["items"] if pod["status"]["phase"] == "Running"
-    ]
+    running_pods = [pod for pod in pods["items"] if pod["status"]["phase"] == "Running"]
 
     return len(running_pods)