From 292548b8b18471502331f72a8032aba8bc3f4894 Mon Sep 17 00:00:00 2001 From: Greg Cormier Date: Thu, 21 Dec 2023 12:48:31 -0500 Subject: [PATCH] chg --- .github/workflows/jekyll-gh-pages.yml | 28 +++++++++++++++++++++++++-- docs/index.html | 4 ++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index 53ed3b4..31a1182 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -23,7 +23,7 @@ concurrency: jobs: # Build job - build: + build-docs: runs-on: ubuntu-latest steps: - name: Checkout @@ -37,14 +37,38 @@ jobs: destination: ./_site - name: Upload artifact uses: actions/upload-pages-artifact@v2 + + build-firmware: + name: Build firmware + runs-on: ubuntu-latest + + steps: + - name: Checkout source code + uses: actions/checkout@v3.3.0 + - name: Build firmware + uses: esphome/build-action@v1.8.0 + id: esphome-build + with: + yaml_file: humitemp.yaml + version: latest + - name: Copy firmware and manifest + run: | + mkdir output + mv ${{ steps.esphome-build.outputs.name }} output/ + jq -s '{"name": "esphome-humitemp v2", "new_install_improv_wait_time": 15, "new_install_prompt_erase": true, "version": "${{ steps.esphome-build.outputs.esphome-version }}", "home_assistant_domain": "esphome", "new_install_skip_erase": false, "builds":.}' output/${{ steps.esphome-build.outputs.name }}/manifest.json > output/manifest.json + - name: Upload artifact + uses: actions/upload-artifact@v3.1.2 + with: + name: manifest.json + path: output # Deployment job deploy: environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest - needs: build + needs: [build-docs, build-firmware] steps: - name: Deploy to GitHub Pages id: deployment diff --git a/docs/index.html b/docs/index.html index 6d2ef37..6ba2f65 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,6 +3,6 @@ title: Home --- + manifest="firmware_esphome/manifest.json"> +

{{ "Hello World!" | downcase }}

\ No newline at end of file