From 0d1c8ab29f4b90f52f7cc5db532cfc8cab917213 Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Thu, 3 Aug 2023 12:31:57 +0300 Subject: [PATCH] Testing upper() --- .github/workflows/push.yml | 6 +----- Translations/make_translation.py | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index fce74b3906..26fc9f314c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -29,8 +29,6 @@ jobs: run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE" - name: Git meta info - env: - GITHUB_CI_PR: ${{ github.event.pull_request.head.sha }} run: echo "GITHUB_CI_PR_SHA=${{github.event_name}}" >> "${GITHUB_ENV}" - name: Build ${{ matrix.model }} @@ -84,9 +82,7 @@ jobs: run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE" - name: Git meta info - env: - GITHUB_CI_PR: ${{ github.event.pull_request.head.sha }} - run: echo "GITHUB_CI_PR_SHA=${{github.event_name}}" >> "${GITHUB_ENV}" + run: echo "GITHUB_CI_PR_SHA=${{github.event.pull_request.head.sha}}" >> "${GITHUB_ENV}" - name: Build ${{ matrix.model }} run: make -C source/ -j$(nproc) model="${{ matrix.model }}" firmware-multi_compressed_European firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian firmware-multi_Chinese+Japanese diff --git a/Translations/make_translation.py b/Translations/make_translation.py index 23135c6e8a..fafc1010e1 100755 --- a/Translations/make_translation.py +++ b/Translations/make_translation.py @@ -1265,15 +1265,15 @@ def get_translation_sanity_checks_text(defs: dict) -> str: def get_version_suffix(ver) -> str: # Check env var from push.yml first: - # if it's pull request then use vX.YY + C.ID for version line as in *C*I with proper tag instead of merge tag for detached tree + # - if it's pull request then use vX.YY + C.ID for version line as in *C*I with proper tag instead of merge tag for detached tree try: print("====>>>> GITHUB_CI_PR_SHA:", os.environ["GITHUB_CI_PR_SHA"]) if os.environ["GITHUB_CI_PR_SHA"] != "": - return "C" + "." + os.environ["GITHUB_CI_PR_SHA"][:8] + return "C" + "." + os.environ["GITHUB_CI_PR_SHA"][:8].upper() except KeyError: print("====>>>> GITHUB_CI_PR_SHA:", "FALSE") True - # No github PR SHA ID, hence "normal" build + # - no github PR SHA ID, hence "normal" build suffix = str("")