-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also bump a few versions to get the CI to pass. In future iterations we could bump more dependencies. Bumped versions: - Ubunto 18.04 to 24.04 - Python 3.7 to 3.11 & 3.12 - Cython==0.28.6 to Cython==0.29.15 - Kivy==2.0.0rc2 to Kivy==2.3.1 - p4a v2020.04.29 to v2024.01.21 - hostpython3==3.8.1 to hostpython3==3.10.12 - Android NDK 19b to 25b - OpenJDK 8 to 17
- Loading branch information
1 parent
8c75846
commit 0cd4e75
Showing
11 changed files
with
117 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
name: Android Build | ||
|
||
on: | ||
# TODO | ||
# push: | ||
pull_request: | ||
|
||
jobs: | ||
android-build: | ||
runs-on: ubuntu-latest | ||
name: Android Build | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Set up Docker | ||
uses: docker/setup-buildx-action@v3 | ||
|
||
- name: Build Docker image | ||
run: | | ||
docker build --tag=zbarcam-android \ | ||
--file=dockerfiles/Dockerfile-android \ | ||
--build-arg CI . | ||
- name: Build Android app | ||
run: | | ||
docker run --env-file dockerfiles/env.list \ | ||
zbarcam-android buildozer android debug | ||
timeout-minutes: 30 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
name: Linux Build | ||
|
||
on: | ||
push: | ||
pull_request: | ||
|
||
jobs: | ||
linux-build: | ||
runs-on: ubuntu-latest | ||
name: Linux Build | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Set up Docker | ||
uses: docker/setup-buildx-action@v3 | ||
|
||
- name: Build Docker image | ||
run: | | ||
docker build --tag=zbarcam-linux \ | ||
--file=dockerfiles/Dockerfile-linux \ | ||
--build-arg CI . | ||
- name: Setup virtual frame buffer | ||
run: | | ||
sudo apt-get update | ||
sudo apt-get install -y xvfb | ||
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & | ||
echo "DISPLAY=:99" >> $GITHUB_ENV | ||
- name: Run tests | ||
run: | | ||
docker run --env-file dockerfiles/env.list \ | ||
-v /tmp/.X11-unix:/tmp/.X11-unix \ | ||
-e DISPLAY=$DISPLAY \ | ||
zbarcam-linux make test | ||
timeout-minutes: 30 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
# used by coveralls.io, refs: | ||
# https://coveralls-python.readthedocs.io/en/latest/usage/tox.html#travisci | ||
CI | ||
TRAVIS | ||
TRAVIS_BRANCH | ||
TRAVIS_JOB_ID | ||
TRAVIS_PULL_REQUEST | ||
# TODO: needed? | ||
GITHUB_* | ||
GITHUB_ACTIONS | ||
GITHUB_TOKEN | ||
COVERALLS_REPO_TOKEN | ||
# used for running UI tests | ||
DISPLAY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Kivy==2.0.0rc2 | ||
Kivy==2.3.1 | ||
Kivy-Garden==0.1.4 | ||
numpy==1.18.4 | ||
opencv-python==4.2.0.34 | ||
numpy==1.26.4 | ||
opencv-python==4.8.1.78 | ||
Pillow==8.2.0 | ||
pyzbar==0.1.8 | ||
xcamera==2019.928 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters