From d61d2673e90ca79c9846e920788c28df1b3b6fea Mon Sep 17 00:00:00 2001
From: Eugene K <eugene.kobyakov@netfoundry.io>
Date: Wed, 25 Nov 2020 11:26:21 -0500
Subject: [PATCH] fix setting BUILD_NUMBER

---
 .github/workflows/build-release.yml | 14 +++++++-------
 .github/workflows/cmake.yml         | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 7bcb1d12..d3cb2567 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -9,7 +9,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     env:
-      BUILD_NUMBER: ${{ github.GITHUB_RUN_NUMBER }}
+      BUILD_NUMBER: ${{ github.run_number }}
     strategy:
       matrix:
         os:
@@ -20,12 +20,12 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: make build dir
-        run: cmake -E make_directory ${{runner.workspace}}/build
-      - name: configure cmake
-        run: cmake -S ${{ github.workspace }} -B ${{runner.workspace}}/build
-      - name: build
-        run: cmake --build ${{runner.workspace}}/build
+      - name: setup/build CMake
+        run: |
+          echo "build number = ${BUILD_NUMBER}"
+          cmake -E make_directory ${{runner.workspace}}/build
+          cmake -S ${{ github.workspace }} -B ${{runner.workspace}}/build
+          cmake --build ${{runner.workspace}}/build
       - name: make artifacts
         run: cmake --build ${{runner.workspace}}/build --target ziti-prox-c
       - name: zip artifacts
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index f3cfa4da..b57a56f5 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -9,7 +9,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     env:
-      BUILD_NUMBER: ${{ github.GITHUB_RUN_NUMBER }}
+      BUILD_NUMBER: ${{ github.run_number }}
     strategy:
       matrix:
         os:
@@ -21,12 +21,12 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: make build dir
-        run: cmake -E make_directory ${{runner.workspace}}/build
-      - name: configure cmake
-        run: cmake -S ${{ github.workspace }} -B ${{runner.workspace}}/build
-      - name: build
-        run: cmake --build ${{runner.workspace}}/build
+      - name: setup/build CMake
+        run: |
+          echo "BUILD_NUMBER = ${BUILD_NUMBER}"
+          cmake -E make_directory ${{runner.workspace}}/build
+          cmake -S ${{ github.workspace }} -B ${{runner.workspace}}/build
+          cmake --build ${{runner.workspace}}/build
       - name: test
         working-directory: ${{runner.workspace}}/build
         run: ctest -VV --no-compress-output