diff options
| author | Jensen Kuras <jensechu@gmail.com> | 2020-10-12 20:48:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 20:48:55 -0500 |
| commit | de9ea47e8eb04abc3e237559ed815ef2dc5fc88d (patch) | |
| tree | 0dd3b0eecb19288a2f13877196122b608724f8ab /.github/workflows | |
| parent | 337019626a8cd0632cd2a6f6bae4ae09ae26cf16 (diff) | |
| parent | 9de96786ad578b4e96e8219e48c778a1a556f0cf (diff) | |
Merge branch 'main' into color-converter-transparency
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/pre-commit.yml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc3dc6835..eaecd2fa4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: CircuitPython version run: | git describe --dirty --tags - echo "::set-env name=CP_VERSION::$(git describe --dirty --tags)" + echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags) - name: Set up Python 3.8 uses: actions/setup-python@v1 with: @@ -132,7 +132,7 @@ jobs: - name: Install dependencies run: | brew install gettext awscli - echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH" + echo >>$GITHUB_PATH /usr/local/opt/gettext/bin - name: Versions run: | gcc --version @@ -146,7 +146,7 @@ jobs: - name: CircuitPython version run: | git describe --dirty --tags - echo "::set-env name=CP_VERSION::$(git describe --dirty --tags)" + echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags) - name: Build mpy-cross run: make -C mpy-cross -j2 - uses: actions/upload-artifact@v2 @@ -243,6 +243,7 @@ jobs: - "metro_m0_express" - "metro_m4_airlift_lite" - "metro_m4_express" + - "metro_m7_1011" - "metro_nrf52840_express" - "mini_sam_m4" - "monster_m4sk" diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 966310304..eac9bfe09 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-python@v1 - name: set PY - run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" + run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" - uses: actions/cache@v1 with: path: ~/.cache/pre-commit |