Skip to content

Commit 030448c

Browse files
committed
Replace submodules with tagged pulls of each repo
1 parent 891d3d4 commit 030448c

File tree

1 file changed

+45
-5
lines changed

1 file changed

+45
-5
lines changed

.github/workflows/build.yaml

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
timeout-minutes: 30
2828
steps:
2929
- uses: actions/checkout@v2
30-
with:
31-
submodules: recursive
30+
# with:
31+
# submodules: recursive
3232

3333
# frontend submod
3434
- uses: actions/checkout@v2
@@ -38,6 +38,46 @@ jobs:
3838
ref: refs/tags/${{github.event.inputs.env}}
3939
- run: cd frontend; echo FRONTEND_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"
4040

41+
# osm-cgimap submod
42+
- uses: actions/checkout@v2
43+
with:
44+
repository: TaskarCenterAtUW/workspaces-cgimap
45+
path: osm-cgimap
46+
ref: refs/tags/${{github.event.inputs.env}}
47+
- run: cd osm-cgimap; echo CGIMAP_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"
48+
49+
# osm-rails submod
50+
- uses: actions/checkout@v2
51+
with:
52+
repository: TaskarCenterAtUW/workspaces-openstreetmap-website
53+
path: osm-rails
54+
ref: refs/tags/${{github.event.inputs.env}}
55+
- run: cd osm-rails; echo OSMRAILS_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"
56+
57+
# pathways submod
58+
- uses: actions/checkout@v2
59+
with:
60+
repository: TaskarCenterAtUW/workspaces-pathways-editor
61+
path: pathways
62+
ref: refs/tags/${{github.event.inputs.env}}
63+
- run: cd pathways; echo PATHWAYS_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"
64+
65+
# rapid submod
66+
- uses: actions/checkout@v2
67+
with:
68+
repository: TaskarCenterAtUW/workspaces-rapid
69+
path: rapid
70+
ref: refs/tags/${{github.event.inputs.env}}
71+
- run: cd rapid; echo RAPID_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"
72+
73+
# tasking-manager submod
74+
- uses: actions/checkout@v2
75+
with:
76+
repository: TaskarCenterAtUW/workspaces-tasking-manager
77+
path: tasking-manager
78+
ref: refs/tags/${{github.event.inputs.env}}
79+
- run: cd tasking-manager; echo TM_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"
80+
4181

4282
- uses: docker/login-action@v3
4383
with:
@@ -64,7 +104,7 @@ jobs:
64104
docker compose -f docker-compose.build.yml --env-file tdei_uw.env push
65105
env:
66106
ENV: ${{ vars.ENV }}
67-
CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.FRONTEND_VERSION }}"
107+
CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}"
68108
ENV_NAME_PARAM: ${{ env.ENV_NAME_PARAM }}
69109

70110
# hosts
@@ -83,14 +123,14 @@ jobs:
83123
- name: Deploy
84124
env:
85125
ENV: ${{ vars.ENV }}
86-
CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.FRONTEND_VERSION }}"
126+
CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}"
87127
ENV_NAME_PARAM: ${{ env.ENV_NAME_PARAM }}
88128

89129
# machine to deploy to
90130
AZURE_DOCKER_HOST_IP: ${{ vars.AZURE_DOCKER_HOST_IP }}
91131

92132
# tag to deploy
93-
WS_DOCKER_TAG: ${{ github.sha }}
133+
WS_DOCKER_TAG: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}"
94134

95135
# hosts
96136
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}

0 commit comments

Comments
 (0)