diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 227b3d6..661ac21 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -3,8 +3,8 @@ name: Build docker on: workflow_dispatch env: - ENOBRANCH: main - LUNATICBRANCH: develop + ENO_BRANCH: 'lunatic-v1-main-last-version' + LUNATIC_MODEL_TAG: '2.2.10' jobs: test: runs-on: ubuntu-latest @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: ${{ env.ENOBRANCH }} + ref: ${{ env.ENO_BRANCH }} repository: InseeFr/Eno path: Eno @@ -33,7 +33,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: ${{ env.LUNATICBRANCH }} + ref: ${{ env.LUNATIC_MODEL_TAG }} repository: InseeFr/Lunatic-model path: Lunatic-model diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index e65b7f0..4075835 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -5,6 +5,10 @@ on: tags: - '*.*.*' +env: + ENO_BRANCH: 'lunatic-v1-main-last-version' + LUNATIC_MODEL_TAG: '2.2.10' + jobs: test: @@ -22,7 +26,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: main + ref: ${{ env.ENO_BRANCH }} repository: InseeFr/Eno path: Eno @@ -34,7 +38,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: develop + ref: ${{ env.LUNATIC_MODEL_TAG }} repository: InseeFr/Lunatic-model path: Lunatic-model diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 67f35fc..68bf715 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,13 +5,15 @@ on: branches: - "**" +env: + ENO_BRANCH: 'lunatic-v1-main-last-version' + LUNATIC_MODEL_TAG: '2.2.10' + jobs: test: runs-on: ubuntu-latest - env: - ENOBRANCH: main - LUNATICBRANCH: develop + steps: - uses: actions/checkout@v2 with: @@ -25,7 +27,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: ${{ env.ENOBRANCH }} + ref: ${{ env.ENO_BRANCH }} repository: InseeFr/Eno path: Eno @@ -37,7 +39,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: ${{ env.LUNATICBRANCH }} + ref: ${{ env.LUNATIC_MODEL_TAG }} repository: InseeFr/Lunatic-model path: Lunatic-model diff --git a/pom.xml b/pom.xml index 632f8cf..797401d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eno-ws war - 1.5.2 + 1.5.3 Eno-Web-Service @@ -21,7 +21,7 @@ 1.2.0 - 2.3.12 + 2.3.13 2.17.0 @@ -118,6 +118,12 @@ fr.insee.lunatic lunatic-model ${lunatic-model.version} + + + xalan + xalan + +