From 8c8b9d04014f9239842889cdb480b8faaeb4d4dd Mon Sep 17 00:00:00 2001 From: M Starch Date: Thu, 3 Nov 2022 10:20:56 -0700 Subject: [PATCH] lestarch: bumping zmq and GDS versions (#1756) * lestarch: bumping zmq and GDS versions * lestarch: adding `wheel` to setup * lestarch: checking tools before leaving action * lestarch: reverting to mac11 runners See: https://github.com/actions/runner-images/issues/6507 --- .github/actions/setup/action.yml | 9 ++++++++- .github/workflows/build-test-macos.yml | 6 +++--- requirements.txt | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index b2869a0ac3..471cb285d4 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -9,7 +9,14 @@ runs: steps: - run: git fetch --tags shell: bash - - run: pip3 install setuptools_scm urllib3 + - run: pip3 install setuptools_scm wheel urllib3 shell: bash - run: pip3 install -r ${{ inputs.location }}/requirements.txt shell: bash + - run: which fprime-util + shell: bash + - run: which fprime-gds + shell: bash + - run: which fpp-check + shell: bash + diff --git a/.github/workflows/build-test-macos.yml b/.github/workflows/build-test-macos.yml index 352096ff2d..3fea6f7501 100644 --- a/.github/workflows/build-test-macos.yml +++ b/.github/workflows/build-test-macos.yml @@ -13,7 +13,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: MacOS-Framework: - runs-on: macos-latest + runs-on: macos-11 steps: - name: "Checkout F´ Repository" uses: actions/checkout@v2 @@ -32,7 +32,7 @@ jobs: retention-days: 5 MacOS-Ref: - runs-on: macos-latest + runs-on: macos-11 steps: - name: "Checkout F´ Repository" uses: actions/checkout@v2 @@ -51,7 +51,7 @@ jobs: retention-days: 5 MacOS-Integration: - runs-on: macos-latest + runs-on: macos-11 steps: - name: "Checkout F´ Repository" uses: actions/checkout@v2 diff --git a/requirements.txt b/requirements.txt index c35d339c78..07101c59c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ Flask==1.1.4 Flask-Compress==1.12 Flask-RESTful==0.3.9 fprime-fpp==1.0.2 -fprime-gds==3.1.3 +fprime-gds==3.1.4 fprime-tools==3.1.1 gcovr==5.1 idna==3.3 @@ -38,7 +38,7 @@ pytest==6.2.5 python-dateutil==2.8.2 python-slugify==6.1.2 pytz==2022.1 -pyzmq==22.3.0 +pyzmq==24.0.1 requests==2.28.0 six==1.16.0 text-unidecode==1.3