From 3ca597f8480c08dac861d642122e1787476c3830 Mon Sep 17 00:00:00 2001 From: jhalbauer Date: Tue, 22 Oct 2024 11:10:03 +0200 Subject: [PATCH] added git pull in tileindices workflows --- .github/workflows/tindex_alkis_lk_he.yml | 2 ++ .github/workflows/tindex_dop_nw.yml | 2 ++ .github/workflows/tindex_dsm_dtm_he.yml | 2 ++ .github/workflows/tindex_dsm_dtm_hh.yml | 2 ++ .github/workflows/tindex_ndsm_nw.yml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/.github/workflows/tindex_alkis_lk_he.yml b/.github/workflows/tindex_alkis_lk_he.yml index 0a05bbb..4d237a0 100644 --- a/.github/workflows/tindex_alkis_lk_he.yml +++ b/.github/workflows/tindex_alkis_lk_he.yml @@ -30,6 +30,8 @@ jobs: echo ${ID} git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config pull.rebase false git add ALKIS/Liegenschaftskataster/HE/HE_ALKIS_LK_tindex.gpkg.gz git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git pull origin main git push diff --git a/.github/workflows/tindex_dop_nw.yml b/.github/workflows/tindex_dop_nw.yml index 3be57bd..7985ff5 100644 --- a/.github/workflows/tindex_dop_nw.yml +++ b/.github/workflows/tindex_dop_nw.yml @@ -29,6 +29,8 @@ jobs: echo ${ID} git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config pull.rebase false git add DOP/NW/openNRW_DOP10_tileindex.gpkg.gz git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git pull origin main git push diff --git a/.github/workflows/tindex_dsm_dtm_he.yml b/.github/workflows/tindex_dsm_dtm_he.yml index efda8ef..acbc66a 100644 --- a/.github/workflows/tindex_dsm_dtm_he.yml +++ b/.github/workflows/tindex_dsm_dtm_he.yml @@ -37,7 +37,9 @@ jobs: run: | git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config pull.rebase false git add DTM/HE/HE_DSM_tindex.gpkg.gz git add DSM/HE/HE_DTM_tindex.gpkg.gz git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git pull origin main git push diff --git a/.github/workflows/tindex_dsm_dtm_hh.yml b/.github/workflows/tindex_dsm_dtm_hh.yml index 2218cbc..65c0a64 100644 --- a/.github/workflows/tindex_dsm_dtm_hh.yml +++ b/.github/workflows/tindex_dsm_dtm_hh.yml @@ -35,7 +35,9 @@ jobs: run: | git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config pull.rebase false git add DTM/HH/hh_dgm1_tindex_proj.gpkg.gz git add DSM/HH/hh_dom_tindex_proj.gpkg.gz git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git config pull.rebase false git push diff --git a/.github/workflows/tindex_ndsm_nw.yml b/.github/workflows/tindex_ndsm_nw.yml index d2c6cb1..5ef7923 100644 --- a/.github/workflows/tindex_ndsm_nw.yml +++ b/.github/workflows/tindex_ndsm_nw.yml @@ -27,6 +27,8 @@ jobs: echo ${ID} git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config pull.rebase false git add nDSM/NRW/nrw_ndom_tindex_proj.gpkg.gz git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git pull origin main git push