Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumped dependency versions; invoking pip as python module #6

Merged
merged 3 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test_ufbt.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Run tests for ufbt action
name: Testsuite

on:
workflow_call:
Expand All @@ -22,10 +22,10 @@ on:
jobs:
test-ufbt-action:
runs-on: ubuntu-latest
name: Test ufbt action
name: Test action
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup ufbt
uses: ./ # Uses an action in the root directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_with_dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test ufbt action with dev SDK
name: Action tests

on:
push:
Expand All @@ -11,7 +11,7 @@ on:

jobs:
run-test-on-latest:
name: Test ufbt action with dev SDK
name: Using dev sdk
uses: ./.github/workflows/test_ufbt.yml
with:
ufbt-version: prerelease
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
name: 'ufbt: Build for Dev branch'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build with ufbt
uses: flipperdevices/[email protected].2
uses: flipperdevices/[email protected]
id: build-app
with:
# Set to 'release' to build for latest published release version
Expand All @@ -43,7 +43,7 @@ jobs:
path: ${{ steps.build-app.outputs.fap-artifacts }}
# You can remove this step if you don't want to check source code formatting
- name: Lint sources
uses: flipperdevices/[email protected].2
uses: flipperdevices/[email protected]
with:
# skip SDK setup, we already did it in previous step
skip-setup: true
Expand Down Expand Up @@ -83,9 +83,9 @@ jobs:
name: 'ufbt: Build for ${{ matrix.name }}'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build with ufbt
uses: flipperdevices/[email protected].2
uses: flipperdevices/[email protected]
id: build-app
with:
sdk-channel: ${{ matrix.sdk-channel }}
Expand Down
10 changes: 5 additions & 5 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ runs:
using: composite
steps:
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
if: inputs.skip-setup == 'false'
with:
python-version: '3.11'
Expand All @@ -111,13 +111,13 @@ runs:
if: inputs.skip-setup == 'false'
shell: bash
run: |
python -m pip install --upgrade pip
python3 -m pip install --upgrade pip
if [ "${{ inputs.ufbt-version }}" == "prerelease" ]; then
pip install --upgrade --pre ufbt
python3 -m pip install --upgrade --pre ufbt
elif [ "${{ inputs.ufbt-version }}" == "latest" ]; then
pip install --upgrade ufbt
python3 -m pip install --upgrade ufbt
else
pip install --upgrade ufbt${{ inputs.ufbt-version }}
python3 -m pip install --upgrade ufbt${{ inputs.ufbt-version }}
fi

- name: Update ufbt
Expand Down
Loading