Skip to content

Commit

Permalink
Combine workflows and use new directory input
Browse files Browse the repository at this point in the history
  • Loading branch information
jesserockz committed Aug 4, 2024
1 parent c441cbe commit a61a764
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 51 deletions.
45 changes: 0 additions & 45 deletions .github/workflows/build-esp-web-tools.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: Build ESPHome Web
name: Build

on:
push:
branches:
- main
pull_request:
paths:
- 'esp-web-tools/**'
- 'esphome-web/**'
- '.github/workflows/build-esphome-web.yml'
- '.github/workflows/build.yml'
workflow_dispatch:
release:
types: [published]
Expand All @@ -17,7 +18,23 @@ concurrency:
cancel-in-progress: true

jobs:
build-firmware:
build-esp-web-tools-firmware:
name: Build ESP Web Tools Firmware
uses: esphome/workflows/.github/workflows/build.yml@main
with:
files: |
esp-web-tools/esp32.yaml
esp-web-tools/esp32c3.yaml
esp-web-tools/esp32s2.yaml
esp-web-tools/esp32s3.yaml
esp-web-tools/esp8266.yaml
esphome-version: 2024.7.3
combined-name: esp-web-tools
release-summary: ${{ github.event_name == 'release' && github.event.release.body || '' }}
release-url: ${{ github.event_name == 'release' && github.event.release.html_url || '' }}
release-version: ${{ github.event_name == 'release' && github.event.release.tag_name || '' }}

build-esphome-web-firmware:
name: Build ESPHome Web Firmware
uses: esphome/workflows/.github/workflows/build.yml@main
with:
Expand All @@ -38,9 +55,10 @@ jobs:
if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
name: Upload to R2
needs:
- build-firmware
- build-esp-web-tools-firmware
- build-esphome-web-firmware
uses: esphome/workflows/.github/workflows/upload.yml@main
with:
name: esphome-web
version: ${{ needs.build-firmware.outputs.version }}
directory: "."
version: ${{ needs.build-esp-web-tools-firmware.outputs.version }}
secrets: inherit

0 comments on commit a61a764

Please sign in to comment.