Skip to content

Commit 52e39f6

Browse files
committed
Revert "Revert "Merge branch 'main' of https://github.com/blubbsy/ZSWatch-HW""
This reverts commit 854df55.
1 parent 59b8e65 commit 52e39f6

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

.github/workflows/production.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
13-
container: ghcr.io/inti-cmnb/kicad8_auto_full:latest
12+
runs-on: ubuntu-22.04
1413

1514
permissions:
1615
contents: write
@@ -33,10 +32,27 @@ jobs:
3332
submodules: recursive
3433

3534
- name: Dependencies
36-
run: git clone https://github.com/Kampi/KiCad.git library
35+
run: |
36+
sudo apt update
37+
38+
wget https://github.com/INTI-CMNB/KiBot/releases/download/v1.7.0/kibot_1.7.0-1_all.deb
39+
sudo apt install ./kibot*_all.deb
40+
41+
wget https://github.com/INTI-CMNB/InteractiveHtmlBom/releases/download/v2.9.0-1/interactivehtmlbom.inti-cmnb_2.9.0-1_all.deb
42+
sudo apt install ./interactivehtmlbom.inti-cmnb*_all.deb
43+
44+
wget https://github.com/INTI-CMNB/KiAuto/releases/download/v2.3.2/kiauto_2.3.2-1_all.deb
45+
sudo apt install ./kiauto*_all.deb
46+
47+
sudo add-apt-repository --yes ppa:kicad/kicad-8.0-releases
48+
sudo apt install --install-recommends kicad
49+
50+
git clone https://github.com/Kampi/KiCad.git library
3751
3852
- name: Extract branch name
53+
shell: bash
3954
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
55+
id: extract_branch
4056

4157
- name: Initialize
4258
run: |
@@ -54,16 +70,18 @@ jobs:
5470
uses: actions/upload-artifact@v4
5571
with:
5672
name: ${{ matrix.device_type }}
57-
path: production
73+
path: |
74+
production
5875
if-no-files-found: ignore
5976

60-
- name: Update image
61-
if: ${{ matrix.NewImage && (github.event.pull_request.merged == true) }}
77+
- if: ${{ matrix.NewImage && (github.event.pull_request.merged == true) }}
78+
name: Update image
6279
run: |
6380
git config --local user.name "github-actions[bot]"
6481
git config --local user.email "github-actions[bot]@users.noreply.github.com"
6582
cp production/${{ matrix.device_type }}/docs/images/PCB_Rendering.png docs/images/Image_Complete.png
6683
git add docs/images/Image_Complete.png
6784
git commit -m "Add image from CI/CD action"
6885
git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
86+
echo https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
6987
git push origin ${{ github.base_ref }}

0 commit comments

Comments
 (0)