diff --git a/.github/workflows/build_debos.yml b/.github/workflows/build_debos.yml index d7ecf634b..2d169f5f1 100644 --- a/.github/workflows/build_debos.yml +++ b/.github/workflows/build_debos.yml @@ -1,6 +1,10 @@ name: Build SquashFS Image on: workflow_dispatch: + inputs: + debos_branch: + type: string + description: neon_debos branch to use push: branches: - dev @@ -13,18 +17,45 @@ jobs: build_squashfs_image: runs-on: 2222.us steps: + - name: Get debos repo branch + id: branch + run: | + DEFAULT_REF=${{ github.ref }} + REQUEST_REF=${{ github.event.inputs.debos_branch }} + echo "::set-output name=debos::${REQUEST_REF:-${DEFAULT_REF}}" - name: Checkout Debos Repository uses: actions/checkout@v3 with: - ref: ${{ github.ref }} + ref: ${{ steps.branch.outputs.debos }} lfs: True repository: NeonGeckoCom/neon_debos path: action/neon_debos + + - name: Create LFS file list + run: | + cd action/neon_debos + git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id + cd ../.. + - name: Restore LFS cache + uses: actions/cache@v3 + id: lfs-cache + with: + path: action/neon_debos/.git/lfs + key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1 - name: Ensure LFS files are pulled + if: steps.lfs-cache.outputs.cache-hit != 'true' run: | - cd action/neon_debos + cd action/neon_debos git lfs pull cd ../.. + - name: Save LFS Cache + if: steps.lfs-cache.outputs.cache-hit != 'true' + id: lfs-cache-save + uses: actions/cache/save@v3 + with: + path: action/neon_debos/.git/lfs + key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1 + - name: Export keys for image build run: | mkdir -p action/neon_debos/overlays/80-google-json-overlay/home/neon/.local/share/neon @@ -36,4 +67,8 @@ jobs: bash action/neon_debos/run_automation.sh debian-neon-image.yml ${{ github.ref_name }} /var/www/html/app/files/neon_images/pi/mycroft_mark_2 rpi4 mark_2 - name: Build and Export OPi5 Image run: | - bash action/neon_debos/run_automation.sh debian-neon-image.yml ${{ github.ref_name }} /var/www/html/app/files/neon_images/orange_pi_5/ opi5 opi5 \ No newline at end of file + bash action/neon_debos/run_automation.sh debian-neon-image.yml ${{ github.ref_name }} /var/www/html/app/files/neon_images/orange_pi_5/ opi5 opi5 + - name: Stop Docker Build Containers + if: failure() || cancelled() + run: | + docker kill neon_debos_ghaction \ No newline at end of file diff --git a/neon_core/version.py b/neon_core/version.py index 0bf008599..444c71183 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "23.12.20" +__version__ = "23.12.28" diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 821a44ad3..232646626 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -3,8 +3,7 @@ ovos-core==0.0.7 # padacioso==0.1.3a2 ovos-plugin-common-play~=0.0.5 -# utils -neon-utils[network]~=1.8 +neon-utils[network]~=1.8,>=1.8.2 ovos-utils~=0.0.35 ovos-bus-client~=0.0.5 diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index 52f8f025f..a6500d113 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -1,7 +1,7 @@ neon-skill-about~=1.0 -# neon-skill-date_time~=1.0,>=1.0.1a2 +# neon-skill-date_time~=1.0,>=1.0.1a3 neon-skill-date_time~=1.0 neon-skill-demo~=1.0,>=1.0.2 -# neon-skill-device_controls~=1.0,>=1.0.1a2 +# neon-skill-device_controls~=1.0,>=1.0.1a4 neon-skill-device_controls~=1.0 neon-skill-ip_address~=1.1 diff --git a/requirements/skills_required.txt b/requirements/skills_required.txt index 149dc6e25..0ef94d056 100644 --- a/requirements/skills_required.txt +++ b/requirements/skills_required.txt @@ -1,3 +1,3 @@ ovos-skill-stop==0.3.0a7 -neon-skill-fallback_unknown~=1.1 +neon-skill-fallback_unknown~=1.2 neon-skill-communication~=0.1 \ No newline at end of file