Merge pull request #575 from opendevshop/ci/github/actions-branches

CI / Scheduled Builds / 1.x Builds failing because of bad `github deployment` call.
opendevshop · Apr 22, 2020 · 2842575 · 2842575
2 parents 548b69d + 7542332
commit 2842575
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,8 +2,7 @@ name: Build
 
 on:
  push:
-   branches:
-   - 1.x
+   branches: 1.x
  pull_request:
    types: [opened, synchronize]
  schedule:
@@ -18,7 +17,7 @@ env:
   GITHUB_TOKEN: ${{ secrets.INPUT_GITHUB_TOKEN }}
   GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
   GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha  }}
-  GITHUB_RUN_LOG_URL: https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}?check_suite_focus=true
+  GITHUB_RUN_LOG_URL: https://github.com/opendevshop/devshop/actions/runs/${{ github.run_id }}
 
 jobs:
   build:
@@ -78,12 +77,12 @@ jobs:
     - name: Create a GitHub Deployment to PR environment
       if: ${{ github.event_name == 'pull_request' }}
       run: |
-        bin/github deployment:start --environment=github.${OS}.pr${GITHUB_PR_NUMBER} --ref=${GITHUB_PR_SHA} --description="Triggered from ./.github/workflows/build.yml"
+        bin/github deployment:start --environment=github.pr${GITHUB_PR_NUMBER}.${OS} --ref=${GITHUB_PR_SHA} --description="Triggered from ./.github/workflows/build.yml"
 
     - name: Create a GitHub Deployment to branch environment
       if: ${{ github.event_name != 'pull_request' }}
       run: |
-        bin/github deployment:start --environment=github.${OS}.$(bin/branch-or-tag) --ref=${GITHUB_SHA}  --description="Triggered from ./.github/workflows/build.yml"
+        bin/github deployment:start --environment=github.$(bin/branch-or-tag).${OS} --ref=${GITHUB_SHA}  --description="Triggered from ./.github/workflows/build.yml"
 
     - name: Docker & Docker Compose Version
       run: |

diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml
@@ -12,6 +12,9 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.INPUT_GITHUB_TOKEN }}
+  GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
+  GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha  }}
+  GITHUB_RUN_LOG_URL: https://github.com/opendevshop/devshop/actions/runs/${{ github.run_id }}
 
 jobs:
   yaml-tasks:
@@ -52,20 +55,16 @@ jobs:
         composer require devshop/power-process
         composer install --prefer-dist --no-progress --no-suggest
 
-    - name: Run Yaml Tests
+    - name: Run Yaml Tasks
       working-directory: ${{env.working-directory}}
       env:
-        GITHUB_TOKEN: ${{ secrets.INPUT_GITHUB_TOKEN }}
-        GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
-        GITHUB_RUN_LOG_URL: https://github.com/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }}?check_suite_focus=true
-
         # @TODO: Get environment variable setting to work.
         # YAML_TASKS_STATUS_URL: https://github.com/${GITHUB_REPOSITORY}/runs/${GITHUB_RUN_ID}?check_suite_focus=true
         PROVISION_PROCESS_OUTPUT: direct
       run: |
         chmod +x yaml-tasks
-        ./yaml-tasks  --ansi -v --hostname=github.com --status-url=${GITHUB_RUN_LOG_URL}
-        ./yaml-tasks --tasks-file tests.yml --ansi -v --hostname=github.com --status-url=${GITHUB_RUN_LOG_URL}
+        ./yaml-tasks  --ansi -v --hostname=github.com --status-url=${GITHUB_RUN_LOG_URL}#step:7:1
+        ./yaml-tasks --tasks-file tests.yml --ansi -v --hostname=github.com --status-url=${GITHUB_RUN_LOG_URL}#step:7:1
 
   power-process:
     name: PowerProcess

diff --git a/src/DevShop/Component/YamlTasks/Command/YamlTasksConsoleCommand.php b/src/DevShop/Component/YamlTasks/Command/YamlTasksConsoleCommand.php
@@ -364,7 +364,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     );
                     $params->context = $task_name;
 
-                    $params->description = substr($params->description, 0, self::GITHUB_STATUS_DESCRIPTION_MAX_SIZE - 3) . '...';
+                    if (strlen($params->description) > self::GITHUB_STATUS_DESCRIPTION_MAX_SIZE) {
+                        $params->description = substr($params->description, 0, self::GITHUB_STATUS_DESCRIPTION_MAX_SIZE - 1) . '…';
+                    }
 
                     // Post status to github
                     try {
@@ -563,7 +565,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
 
                 if (!$input->getOption('dry-run')) {
-                    $params->description = substr($params->description, 0, self::GITHUB_STATUS_DESCRIPTION_MAX_SIZE - 3) . '...';
+                    $params->description = substr($params->description, 0, self::GITHUB_STATUS_DESCRIPTION_MAX_SIZE);
                     $response = $client->getHttpClient()->post("/repos/$this->repoOwner/$this->repoName/statuses/$this->repoSha", json_encode($params));
                     $this->commitStatusMessage($response, $task_name, $task, $params->state);
                 }