Skip to content

Commit 309516c

Browse files
committed
ci: update workflows to use reusable repo
1 parent 1261111 commit 309516c

File tree

3 files changed

+11
-41
lines changed

3 files changed

+11
-41
lines changed

.github/workflows/build-ci.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,11 @@ on:
1313
workflow_dispatch:
1414

1515
jobs:
16-
extract-vars:
17-
uses: hotosm/gh-workflows/.github/workflows/py_app_version.yml@main
18-
with:
19-
package_name: osm_rawdata
20-
2116
backend-ci-build:
2217
uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main
23-
needs: [extract-vars]
2418
with:
2519
build_target: ci
2620
image_tags: |
27-
"ghcr.io/hotosm/osm-rawdata:${{ needs.extract-vars.outputs.app_version }}-ci"
2821
"ghcr.io/hotosm/osm-rawdata:ci"
2922
build_args: |
30-
PKG_VERSION=${{ needs.extract-vars.outputs.app_version }}
23+
COMMIT_REF=${{ github.sha }}

.github/workflows/build.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
name: Build
22

33
on:
4-
release:
5-
types: [published]
4+
push:
5+
tags:
6+
- "*"
67
# Allow manual trigger
78
workflow_dispatch:
89

910
jobs:
10-
extract-vars:
11-
uses: hotosm/gh-workflows/.github/workflows/py_app_version.yml@main
12-
with:
13-
package_name: osm_rawdata
14-
15-
backend-ci-build:
11+
ci-build:
1612
uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main
17-
needs: [extract-vars]
1813
with:
1914
build_target: prod
20-
image_tags: |
21-
"ghcr.io/hotosm/osm-rawdata:${{ needs.extract-vars.outputs.app_version }}"
22-
"ghcr.io/hotosm/osm-rawdata:latest"
15+
image_name: "ghcr.io/${{ github.repository }}"
2316
build_args: |
24-
PKG_VERSION=${{ needs.extract-vars.outputs.app_version }}
17+
COMMIT_REF=${{ github.sha }}

.github/workflows/docs.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,14 @@ on:
1111
workflow_dispatch:
1212

1313
jobs:
14-
get_cache_key:
15-
runs-on: ubuntu-latest
16-
outputs:
17-
cache_key: ${{ steps.set_cache_key.outputs.cache_key }}
18-
steps:
19-
- name: Set cache key
20-
id: set_cache_key
21-
run: echo "cache_key=docs-build-$(date --utc +'%Y-%m-%d_%H:%M:%S')" >> $GITHUB_OUTPUT
22-
2314
build_doxygen:
2415
uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@main
25-
needs: [get_cache_key]
2616
with:
27-
cache_paths: |
28-
docs/apidocs
29-
cache_key: ${{ needs.get_cache_key.outputs.cache_key }}
17+
output_path: docs/apidocs
3018

3119
publish_docs:
3220
uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@main
33-
needs:
34-
- get_cache_key
35-
- build_doxygen
21+
needs: [build_doxygen]
3622
with:
37-
image: ghcr.io/hotosm/osm-rawdata:ci
38-
cache_paths: |
39-
docs/apidocs
40-
cache_key: ${{ needs.get_cache_key.outputs.cache_key }}
23+
image: ghcr.io/${{ github.repository }}:ci
24+
doxygen: true

0 commit comments

Comments
 (0)