ci: Use proper SHA when downloading core

This allows to directly download PR commits and avoid tricks with local copy. This improves dependencies resolving when PR added new external repo.
apache · Nov 16, 2023 · c423a9a · c423a9a
1 parent 22ebb10
commit c423a9a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/.github/workflows/build_blinky.yml b/.github/workflows/build_blinky.yml
@@ -53,8 +53,11 @@ jobs:
              cp -f .github/project.yml build/project.yml
              cd build
              newt upgrade --shallow=1
-             rm -rf repos/apache-mynewt-core
-             git clone .. repos/apache-mynewt-core
+             cd repos/apache-mynewt-core
+             git fetch origin `git rev-parse HEAD`
+             cd ../..
+             sed -i "s/0.0.0/`git rev-parse HEAD`-commit/g" project.yml
+             newt upgrade --shallow=1
              cd ..
       - name: Build Blinky
         shell: bash

diff --git a/.github/workflows/build_bootloader.yml b/.github/workflows/build_bootloader.yml
@@ -53,8 +53,11 @@ jobs:
              cp -f .github/project.yml build/project.yml
              cd build
              newt upgrade --shallow=1
-             rm -rf repos/apache-mynewt-core
-             git clone .. repos/apache-mynewt-core
+             cd repos/apache-mynewt-core
+             git fetch origin `git rev-parse HEAD`
+             cd ../..
+             sed -i "s/0.0.0/`git rev-parse HEAD`-commit/g" project.yml
+             newt upgrade --shallow=1
              cd ..
       - name: Build bootloader
         shell: bash

diff --git a/.github/workflows/build_cc_target.yml b/.github/workflows/build_cc_target.yml
@@ -50,8 +50,11 @@ jobs:
              cp -f .github/project.yml build/project.yml
              cd build
              newt upgrade --shallow=1
-             rm -rf repos/apache-mynewt-core
-             git clone .. repos/apache-mynewt-core
+             cd repos/apache-mynewt-core
+             git fetch origin `git rev-parse HEAD`
+             cd ../..
+             sed -i "s/0.0.0/`git rev-parse HEAD`-commit/g" project.yml
+             newt upgrade --shallow=1
              cd ..
       - name: Build targets
         shell: bash

diff --git a/.github/workflows/build_targets.yml b/.github/workflows/build_targets.yml
@@ -48,9 +48,12 @@ jobs:
              cp -f .github/project.yml build/project.yml
              cd build
              newt upgrade --shallow=1
+             cd repos/apache-mynewt-core
+             git fetch origin `git rev-parse HEAD`
+             cd ../..
+             sed -i "s/0.0.0/`git rev-parse HEAD`-commit/g" project.yml
+             newt upgrade --shallow=1
              rm -rf targets
-             rm -rf repos/apache-mynewt-core
-             git clone .. repos/apache-mynewt-core
              cd ..
       - name: Build targets
         shell: bash

diff --git a/.github/workflows/newt_test_all.yml b/.github/workflows/newt_test_all.yml
@@ -45,8 +45,11 @@ jobs:
              cp -f .github/project.yml build/project.yml
              cd build
              newt upgrade --shallow=1
-             rm -rf repos/apache-mynewt-core
-             git clone .. repos/apache-mynewt-core
+             cd repos/apache-mynewt-core
+             git fetch origin `git rev-parse HEAD`
+             cd ../..
+             sed -i "s/0.0.0/`git rev-parse HEAD`-commit/g" project.yml
+             newt upgrade --shallow=1
              cd ..
       - name: newt test all
         run: |