Просмотр исходного кода

Merge pull request #13016 from id/0510-update-ce-only-workflows

ci: some scheduled workflows should only run on emqx/emqx
Ivan Dyachkov 1 год назад
Родитель
Сommit
ac9da9d8a2

+ 2 - 2
.github/workflows/build_and_push_docker_images.yaml

@@ -142,14 +142,14 @@ jobs:
 
 
       - name: Login to hub.docker.com
       - name: Login to hub.docker.com
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
-        if: inputs.publish || github.repository_owner != 'emqx'
+        if: inputs.publish && contains(matrix.profile[1], 'docker.io')
         with:
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
 
       - name: Login to AWS ECR
       - name: Login to AWS ECR
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
-        if: inputs.publish || github.repository_owner != 'emqx'
+        if: inputs.publish && contains(matrix.profile[1], 'public.ecr.aws')
         with:
         with:
           registry: public.ecr.aws
           registry: public.ecr.aws
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}

+ 1 - 1
.github/workflows/build_packages_cron.yaml

@@ -68,7 +68,7 @@ jobs:
       - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
       - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: success()
         if: success()
         with:
         with:
-          name: ${{ matrix.profile[0] }}-${{ matrix.os }}
+          name: ${{ matrix.profile[0] }}-${{ matrix.os }}-${{ github.ref_name }}
           path: _packages/${{ matrix.profile[0] }}/
           path: _packages/${{ matrix.profile[0] }}/
           retention-days: 7
           retention-days: 7
       - name: Send notification to Slack
       - name: Send notification to Slack

+ 1 - 0
.github/workflows/codeql.yaml

@@ -10,6 +10,7 @@ permissions:
 
 
 jobs:
 jobs:
   analyze:
   analyze:
+    if: github.repository == 'emqx/emqx'
     name: Analyze
     name: Analyze
     runs-on: ubuntu-22.04
     runs-on: ubuntu-22.04
     timeout-minutes: 360
     timeout-minutes: 360

+ 4 - 3
.github/workflows/green_master.yaml

@@ -30,9 +30,10 @@ jobs:
         shell: bash
         shell: bash
         env:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPO: ${{ github.repository }}
         run: |
         run: |
-          gh api --method GET -f head_sha=$(git rev-parse HEAD) -f status=completed -f exclude_pull_requests=true /repos/emqx/emqx/actions/runs > runs.json
+          gh api --method GET -f head_sha=$(git rev-parse HEAD) -f status=completed -f exclude_pull_requests=true /repos/${GITHUB_REPO}/actions/runs > runs.json
           for id in $(jq -r '.workflow_runs[] | select((."conclusion" == "failure") and (."name" != "Keep master green") and .run_attempt < 3) | .id' runs.json); do
           for id in $(jq -r '.workflow_runs[] | select((."conclusion" == "failure") and (."name" != "Keep master green") and .run_attempt < 3) | .id' runs.json); do
-            echo "rerun https://github.com/emqx/emqx/actions/runs/$id"
-            gh api --method POST /repos/emqx/emqx/actions/runs/$id/rerun-failed-jobs || true
+            echo "rerun https://github.com/${GITHUB_REPO}/actions/runs/$id"
+            gh api --method POST /repos/${GITHUB_REPO}/actions/runs/$id/rerun-failed-jobs || true
           done
           done

+ 2 - 1
.github/workflows/scorecard.yaml

@@ -16,8 +16,9 @@ permissions: read-all
 
 
 jobs:
 jobs:
   analysis:
   analysis:
+    if: github.repository == 'emqx/emqx'
     name: Scorecard analysis
     name: Scorecard analysis
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
     permissions:
       security-events: write
       security-events: write
       id-token: write
       id-token: write

+ 2 - 2
.github/workflows/stale.yaml

@@ -13,8 +13,8 @@ permissions:
 
 
 jobs:
 jobs:
   stale:
   stale:
-    if: github.repository_owner == 'emqx'
-    runs-on: ${{ endsWith(github.repository, '/emqx') && 'ubuntu-22.04' || fromJSON('["self-hosted","ephemeral","linux","x64"]') }}
+    if: github.repository == 'emqx/emqx'
+    runs-on: ubuntu-22.04
     permissions:
     permissions:
       issues: write
       issues: write
       pull-requests: none
       pull-requests: none

+ 2 - 2
scripts/pkg-tests.sh

@@ -79,9 +79,9 @@ emqx_prepare(){
     if [ ! -d "${PAHO_MQTT_TESTING_PATH}" ]; then
     if [ ! -d "${PAHO_MQTT_TESTING_PATH}" ]; then
         git clone -b develop-4.0 https://github.com/emqx/paho.mqtt.testing.git "${PAHO_MQTT_TESTING_PATH}"
         git clone -b develop-4.0 https://github.com/emqx/paho.mqtt.testing.git "${PAHO_MQTT_TESTING_PATH}"
     fi
     fi
-    # Debian 12 complains if we don't use venv
+    # Debian 12 and Ubuntu 24.04 complain if we don't use venv
     case "${SYSTEM:-}" in
     case "${SYSTEM:-}" in
-        debian12)
+        debian12|ubuntu24.04)
             apt-get update -y && apt-get install -y virtualenv
             apt-get update -y && apt-get install -y virtualenv
             virtualenv venv
             virtualenv venv
             # https://www.shellcheck.net/wiki/SC1091
             # https://www.shellcheck.net/wiki/SC1091