Skip to content

Commit ff9257e

Browse files
committed
Test
1 parent c039875 commit ff9257e

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed
File renamed without changes.

.github/workflows/deploy.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525

2626
jobs:
2727
# Build job
28-
build:
28+
build-docs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout
@@ -50,12 +50,22 @@ jobs:
5050
with:
5151
path: docs/.vitepress/dist
5252

53+
compile-firmware:
54+
name: Compile Doorman Stock Firmware
55+
uses: ./.github/workflows/esphome-build.yml
56+
with:
57+
files: ./firmware/doorman-stock.yaml
58+
name: Doorman
59+
manifest_filename: doorman-stock-manifest.json
60+
esphome_version: latest
61+
directory_name: doorman-stock
62+
5363
# Deployment job
5464
deploy:
5565
environment:
5666
name: github-pages
5767
url: ${{ steps.deployment.outputs.page_url }}
58-
needs: build
68+
needs: [build-docs, compile-firmware]
5969
runs-on: ubuntu-latest
6070
name: Deploy
6171
steps:

.github/workflows/esphome-build.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
name: Build and Publish ESPHome firmware
22

3-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
4-
permissions:
5-
contents: read
6-
pages: write
7-
id-token: write
8-
93
on:
104
workflow_call:
115
inputs:
@@ -18,11 +12,6 @@ on:
1812
required: false
1913
type: string
2014
default: ESPHome
21-
clean:
22-
description: Remove deleted files from the build
23-
required: false
24-
type: boolean
25-
default: true
2615
manifest_filename:
2716
description: Filename of the manifest to write.
2817
required: false
@@ -73,19 +62,16 @@ jobs:
7362
mv "${{ steps.esphome-build.outputs.name}}" temp
7463
mv temp "${{ inputs.directory_name }}"
7564
mv "${{ inputs.directory_name }}" output/
76-
- uses: actions/upload-artifact@v3.1.2
65+
- uses: actions/upload-artifact@v4
7766
with:
7867
name: ${{ inputs.name }}
7968
path: output
8069

8170
publish:
8271
if: (github.event_name == 'workflow_dispatch' || github.event_name == 'push') && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/docs-test')
83-
name: Publish new firmware and website to GitHub Pages
72+
name: Publish new firmware
8473
runs-on: ubuntu-latest
8574
needs: [build]
86-
environment:
87-
name: github-pages
88-
url: ${{ steps.deployment.outputs.page_url }}
8975
steps:
9076
- uses: actions/checkout@v3.5.3
9177
- uses: actions/download-artifact@v3.0.2

0 commit comments

Comments
 (0)