From e30277c58c01a3ac283ac040d516dc5ea44d1e95 Mon Sep 17 00:00:00 2001 From: Michael Hoisie Date: Sat, 20 Nov 2021 12:09:24 -0800 Subject: [PATCH] Fix naming for M1 --- .github/workflows/build_native_runtime.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_native_runtime.yml b/.github/workflows/build_native_runtime.yml index 1935c09596..40a7a4462c 100644 --- a/.github/workflows/build_native_runtime.yml +++ b/.github/workflows/build_native_runtime.yml @@ -67,26 +67,18 @@ jobs: - name: Rename libnativeruntime for Linux if: runner.os == 'Linux' run: | + echo "NATIVERUNTIME_ARTIFACT_FILE=librobolectric-nativeruntime-linux-x86_64.so" >> $GITHUB_ENV mv build/libnativeruntime.so build/librobolectric-nativeruntime-linux-x86_64.so - name: Rename libnativeruntime for macOS if: runner.os == 'macOS' run: | - mv build/libnativeruntime.dylib build/librobolectric-nativeruntime-mac-x86_64.dylib + echo "NATIVERUNTIME_ARTIFACT_FILE=build/librobolectric-nativeruntime-mac-$(uname -m).dylib" >> $GITHUB_ENV + mv build/libnativeruntime.dylib build/librobolectric-nativeruntime-mac-$(uname -m).dylib - - name: Upload libnativeruntime for Linux - if: runner.os == 'Linux' - uses: actions/upload-artifact@v2 - with: - name: librobolectric-nativeruntime-linux-x86_64.so - path: | - build/librobolectric-nativeruntime-linux-x86_64.so - build/*.dylib - - - name: Upload libnativeruntime for macOS - if: runner.os == 'macOS' + - name: Upload libnativeruntime uses: actions/upload-artifact@v2 with: - name: librobolectric-nativeruntime-mac-x86_64.dylib + name: ${{env.NATIVERUNTIME_ARTIFACT_FILE}} path: | - build/librobolectric-nativeruntime-mac-x86_64.dylib + build/${{env.NATIVERUNTIME_ARTIFACT_FILE}}