Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .github/workflows/entree-carto-qua.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
S3_CONF_FILENAME: ${{ vars.S3_CONF_FILENAME || secrets.S3_CONF_FILENAME }}
S3_PATH: ${{ vars.S3_PATH || secrets.S3_PATH }}
LAYER_COUNT: ${{ vars.LAYER_COUNT }}
MAX_COMMIT: ${{ vars.MAX_COMMIT || 100 }}
steps:
- name: Checkout dev branch
# On clone la branche dev pour avoir accès au code source (scripts Python,
Expand Down Expand Up @@ -79,12 +80,12 @@ jobs:

# Récupère dist-dev s'il existe, sinon crée une branche orpheline
if git fetch origin dist-dev 2>/dev/null; then
git fetch origin dist-dev:dist
git worktree add --force "$DIST_WORKTREE" dist
git fetch origin dist-dev:dist-dev
git worktree add --force "$DIST_WORKTREE" dist-dev
cd "$DIST_WORKTREE"
git pull --rebase origin dist-dev
else
git worktree add --force "$DIST_WORKTREE" --orphan dist-dev
git worktree add --force --orphan -b dist-dev "$DIST_WORKTREE"
cd "$DIST_WORKTREE"
git rm -rf . || true
fi
Expand All @@ -98,3 +99,12 @@ jobs:

cd "$GITHUB_WORKSPACE"
git worktree remove --force "$DIST_WORKTREE"

- name: Trim dist-dev history
# Copie le script (présent sur dev) avant de basculer sur dist-dev,
# puis tronque l'historique si le nombre de commits dépasse MAX_COMMIT.
run: |
cp ./scripts/trim_dist_history.sh /tmp/trim_dist_history.sh
git fetch origin dist-dev
git checkout -B dist-dev origin/dist-dev
bash /tmp/trim_dist_history.sh "$MAX_COMMIT" dist-dev
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"workbench.colorTheme": "escook Light Soft"
}
24 changes: 24 additions & 0 deletions keys copy.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
administratif
adresse
agriculture
altimetrie
cartes
cartovecto
clc
decouverte
economie
enr
environnement
essentiels
geodesie
lambert93
ocsge
ocsge-ng
ortho
orthohisto
parcellaire
satellite
sol
topographie
transports
full entree-carto ign_scan_ws
Loading
Loading