Skip to content

Commit eb28a07

Browse files
committed
chore: sync main with develop (remove release-please, rewire docker)
Brings main up to develop's content: removes the release-please workflow and switches docker-image.yml to trigger on push to main instead of the removed release-please workflow_run.
1 parent 483a5eb commit eb28a07

2 files changed

Lines changed: 13 additions & 42 deletions

File tree

.github/workflows/docker-image.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
11
name: Docker Image & deploy
22

3+
# Build & publish the Docker image and trigger the Render deploy whenever main
4+
# changes. (Previously chained to the release-please workflow via workflow_run;
5+
# that release workflow has been removed.)
36
on:
4-
workflow_run:
5-
workflows: [release-please]
6-
types: [completed]
7+
push:
8+
branches: [main]
9+
workflow_dispatch:
710

811
jobs:
912
build-and-publish:
1013
runs-on: ubuntu-latest
11-
if: github.event.workflow_run.conclusion == 'success'
1214

1315
steps:
1416
- name: Checkout the code
15-
uses: actions/checkout@v3
16-
17-
- name: Build the Docker image
18-
run: docker build . --file Dockerfile --tag frabenrui/flamapy-ide:${{ github.ref_name }}
17+
uses: actions/checkout@v4
1918

2019
- name: Log in to DockerHub
2120
uses: docker/login-action@v3
2221
with:
2322
username: ${{ secrets.DOCKERHUB_USERNAME }}
2423
password: ${{ secrets.DOCKERHUB_API_TOKEN }}
2524

26-
- name: Push the Docker image
27-
run: docker push frabenrui/flamapy-ide:${{ github.ref_name }}
25+
- name: Build the Docker image
26+
run: docker build . --file Dockerfile --tag frabenrui/flamapy-ide:latest
2827

29-
- name: Tag as latest
30-
if: startsWith(github.ref, 'refs/tags/')
31-
run: |
32-
docker tag frabenrui/flamapy-ide:${{ github.ref_name }} frabenrui/flamapy-ide:latest
33-
docker push frabenrui/flamapy-ide:latest
28+
- name: Push the Docker image
29+
run: docker push frabenrui/flamapy-ide:latest
3430

3531
deploy:
32+
needs: build-and-publish
3633
runs-on: ubuntu-latest
37-
if: github.event.workflow_run.conclusion == 'success'
3834

3935
steps:
4036
- name: Deploy
4137
env:
42-
deploy_url: ${{secrets.RENDER_DEPLOY_HOOK_URL}}
38+
deploy_url: ${{ secrets.RENDER_DEPLOY_HOOK_URL }}
4339
run: |
4440
curl "$deploy_url"

.github/workflows/release-please.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)