diff --git a/.github/workflows/daily-builds-amd.yml b/.github/workflows/daily-builds-amd.yml index 10a7ab3..c4c29a0 100644 --- a/.github/workflows/daily-builds-amd.yml +++ b/.github/workflows/daily-builds-amd.yml @@ -54,6 +54,8 @@ env: TARGET_OS: "debian-11" TOOLCHAIN_VERSION: ${{ github.events.inputs.toolchain_version || 'v4' }} MG_PACKAGE_PATH: "memgraph_debian-11.deb" + MEMGRAPH_IMAGE: "memgraph/memgraph:${{ github.run_id }}" + MEMGRAPH_TAR: "memgraph_amd64.tar.gz" MAGE_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}" MAGE_TAR: "mage_amd64.tar.gz" MAGE_NO_ML_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}-no-ml" @@ -111,8 +113,8 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd mage && git pull && git checkout ${{ env.MAGE_TAG }} + cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3 @@ -147,8 +149,8 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd mage && git pull && git checkout ${{ env.MAGE_TAG }} + cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }} #NOTE: Remove this step before merge - name: "Move no ML files into mage directory" @@ -191,9 +193,7 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd lab && git checkout ${{ env.LAB_TAG }} - cd ../mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd lab && git pull && git checkout ${{ env.LAB_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3 @@ -233,9 +233,7 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd lab && git checkout ${{ env.LAB_TAG }} - cd ../mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd lab && git pull && git checkout ${{ env.LAB_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3 @@ -277,7 +275,7 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd lab && git checkout ${{ env.LAB_TAG }} + cd lab && git pull && git checkout ${{ env.LAB_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3 diff --git a/.github/workflows/daily-builds-arm.yml b/.github/workflows/daily-builds-arm.yml index c14e43d..431bf1b 100644 --- a/.github/workflows/daily-builds-arm.yml +++ b/.github/workflows/daily-builds-arm.yml @@ -54,6 +54,8 @@ env: TARGET_OS: "debian-11-arm" TOOLCHAIN_VERSION: ${{ github.events.inputs.toolchain_version || 'v4' }} MG_PACKAGE_PATH: "memgraph_debian-11-arm.deb" + MEMGRAPH_IMAGE: "memgraph/memgraph:${{ github.run_id }}" + MEMGRAPH_TAR: "memgraph_amd64.tar.gz" MAGE_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}" MAGE_TAR: "mage_arm64.tar.gz" MAGE_NO_ML_IMAGE: "memgraph/memgraph-mage:${{ github.run_id }}-no-ml" @@ -114,8 +116,8 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd mage && git pull && git checkout ${{ env.MAGE_TAG }} + cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3 @@ -153,8 +155,8 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd mage && git pull && git checkout ${{ env.MAGE_TAG }} + cd cpp/memgraph && git pull && git checkout ${{ env.MEMGRAPH_TAG }} #NOTE: Remove this step before merge - name: "Move no ML files into mage directory" @@ -200,9 +202,7 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd lab && git checkout ${{ env.LAB_TAG }} - cd ../mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd lab && git pull && git checkout ${{ env.LAB_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3 @@ -245,9 +245,7 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd lab && git checkout ${{ env.LAB_TAG }} - cd ../mage && git checkout ${{ env.MAGE_TAG }} - cd cpp/memgraph && git checkout ${{ env.MEMGRAPH_TAG }} + cd lab && git pull && git checkout ${{ env.LAB_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3 @@ -292,7 +290,7 @@ jobs: - name: "Checkout correct versions in submodules" run: | - cd lab && git checkout ${{ env.LAB_TAG }} + cd lab && git pull && git checkout ${{ env.LAB_TAG }} - name: "Download memgraph package" uses: actions/download-artifact@v3