diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index a28fff7..9da69f4 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -22,33 +22,23 @@ concurrency: cancel-in-progress: false jobs: - # Build job - build-docs: + build-firmware: + name: Build firmware runs-on: ubuntu-latest + steps: - - name: Checkout + - name: Checkout source code uses: actions/checkout@v4 + - name: Setup Pages uses: actions/configure-pages@v4 + - name: Build with Jekyll uses: actions/jekyll-build-pages@v1 with: source: ./docs destination: ./_site - - name: Upload artifact - uses: actions/upload-pages-artifact@v2 - - build-firmware: - name: Build firmware - runs-on: ubuntu-latest - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - steps: - - name: Checkout source code - uses: actions/checkout@v4 - - name: Build firmware uses: esphome/build-action@v1.8.0 id: esphome-build @@ -56,17 +46,17 @@ jobs: yaml_file: humitemp.yaml version: latest -# - name: Copy firmware and manifest -# run: | -# mkdir docs/firmware -# mv ${{ steps.esphome-build.outputs.name }} docs/firmware -# jq -s '{"name": "esphome-humitemp v2", "new_install_improv_wait_time": 15, "new_install_prompt_erase": true, "version": "${{ steps.esphome-build.outputs.version }}", "home_assistant_domain": "esphome", "new_install_skip_erase": false, "builds":.}' docs/firmware/${{ steps.esphome-build.outputs.name }}/manifest.json >> docs/firmware/manifest.json -# ls -la -# find docs/ -# + - name: Copy firmware and manifest + run: | + mkdir docs/firmware + mv ${{ steps.esphome-build.outputs.name }} docs/firmware + jq -s '{"name": "esphome-humitemp v2", "new_install_improv_wait_time": 15, "new_install_prompt_erase": true, "version": "${{ steps.esphome-build.outputs.version }}", "home_assistant_domain": "esphome", "new_install_skip_erase": false, "builds":.}' docs/firmware/${{ steps.esphome-build.outputs.name }}/manifest.json >> docs/firmware/manifest.json + ls -la + find docs/ + - name: Upload GitHub Pages artifact - uses: actions/upload-pages-artifact@v2.0.0 + uses: actions/upload-pages-artifact@v2 with: path: docs