Skip to content

Commit fd70469

Browse files
committed
Add git pull to checkouts
1 parent 2035c47 commit fd70469

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

.github/workflows/daily-builds-amd.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ env:
5454
TARGET_OS: "debian-11"
5555
TOOLCHAIN_VERSION: ${{ github.events.inputs.toolchain_version || 'v4' }}
5656
MG_PACKAGE_PATH: "memgraph_debian-11.deb"
57+
MEMGRAPH_IMAGE: "memgraph/memgraph:${{ github.run_id }}"
58+
MEMGRAPH_TAR: "memgraph_amd64.tar.gz"
5759
MAGE_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}"
5860
MAGE_TAR: "mage_amd64.tar.gz"
5961
MAGE_NO_ML_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}-no-ml"
@@ -111,8 +113,8 @@ jobs:
111113

112114
- name: "Checkout correct versions in submodules"
113115
run: |
114-
cd mage && git checkout ${{ env.MAGE_TAG }}
115-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
116+
cd mage && git pull && git checkout ${{ env.MAGE_TAG }}
117+
cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }}
116118
117119
- name: "Download memgraph package"
118120
uses: actions/download-artifact@v3
@@ -147,8 +149,8 @@ jobs:
147149

148150
- name: "Checkout correct versions in submodules"
149151
run: |
150-
cd mage && git checkout ${{ env.MAGE_TAG }}
151-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
152+
cd mage && git pull && git checkout ${{ env.MAGE_TAG }}
153+
cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }}
152154
153155
#NOTE: Remove this step before merge
154156
- name: "Move no ML files into mage directory"
@@ -191,9 +193,7 @@ jobs:
191193

192194
- name: "Checkout correct versions in submodules"
193195
run: |
194-
cd lab && git checkout ${{ env.LAB_TAG }}
195-
cd ../mage && git checkout ${{ env.MAGE_TAG }}
196-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
196+
cd lab && git pull && git checkout ${{ env.LAB_TAG }}
197197
198198
- name: "Download memgraph package"
199199
uses: actions/download-artifact@v3
@@ -233,9 +233,7 @@ jobs:
233233

234234
- name: "Checkout correct versions in submodules"
235235
run: |
236-
cd lab && git checkout ${{ env.LAB_TAG }}
237-
cd ../mage && git checkout ${{ env.MAGE_TAG }}
238-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
236+
cd lab && git pull && git checkout ${{ env.LAB_TAG }}
239237
240238
- name: "Download memgraph package"
241239
uses: actions/download-artifact@v3
@@ -277,7 +275,7 @@ jobs:
277275

278276
- name: "Checkout correct versions in submodules"
279277
run: |
280-
cd lab && git checkout ${{ env.LAB_TAG }}
278+
cd lab && git pull && git checkout ${{ env.LAB_TAG }}
281279
282280
- name: "Download memgraph package"
283281
uses: actions/download-artifact@v3

.github/workflows/daily-builds-arm.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ env:
5454
TARGET_OS: "debian-11-arm"
5555
TOOLCHAIN_VERSION: ${{ github.events.inputs.toolchain_version || 'v4' }}
5656
MG_PACKAGE_PATH: "memgraph_debian-11-arm.deb"
57+
MEMGRAPH_IMAGE: "memgraph/memgraph:${{ github.run_id }}"
58+
MEMGRAPH_TAR: "memgraph_amd64.tar.gz"
5759
MAGE_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}"
5860
MAGE_TAR: "mage_arm64.tar.gz"
5961
MAGE_NO_ML_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}-no-ml"
@@ -114,8 +116,8 @@ jobs:
114116

115117
- name: "Checkout correct versions in submodules"
116118
run: |
117-
cd mage && git checkout ${{ env.MAGE_TAG }}
118-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
119+
cd mage && git pull && git checkout ${{ env.MAGE_TAG }}
120+
cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }}
119121
120122
- name: "Download memgraph package"
121123
uses: actions/download-artifact@v3
@@ -153,8 +155,8 @@ jobs:
153155

154156
- name: "Checkout correct versions in submodules"
155157
run: |
156-
cd mage && git checkout ${{ env.MAGE_TAG }}
157-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
158+
cd mage && git pull && git checkout ${{ env.MAGE_TAG }}
159+
cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }}
158160
159161
#NOTE: Remove this step before merge
160162
- name: "Move no ML files into mage directory"
@@ -200,9 +202,7 @@ jobs:
200202

201203
- name: "Checkout correct versions in submodules"
202204
run: |
203-
cd lab && git checkout ${{ env.LAB_TAG }}
204-
cd ../mage && git checkout ${{ env.MAGE_TAG }}
205-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
205+
cd lab && git pull && git checkout ${{ env.LAB_TAG }}
206206
207207
- name: "Download memgraph package"
208208
uses: actions/download-artifact@v3
@@ -245,9 +245,7 @@ jobs:
245245

246246
- name: "Checkout correct versions in submodules"
247247
run: |
248-
cd lab && git checkout ${{ env.LAB_TAG }}
249-
cd ../mage && git checkout ${{ env.MAGE_TAG }}
250-
cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }}
248+
cd lab && git pull && git checkout ${{ env.LAB_TAG }}
251249
252250
- name: "Download memgraph package"
253251
uses: actions/download-artifact@v3
@@ -292,7 +290,7 @@ jobs:
292290

293291
- name: "Checkout correct versions in submodules"
294292
run: |
295-
cd lab && git checkout ${{ env.LAB_TAG }}
293+
cd lab && git pull && git checkout ${{ env.LAB_TAG }}
296294
297295
- name: "Download memgraph package"
298296
uses: actions/download-artifact@v3

0 commit comments

Comments
 (0)