From 848f72997de8aad23c601c8e19761f7d5eb104e5 Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Wed, 29 Sep 2021 15:11:48 +0200
Subject: [PATCH 01/14] Ajoute sha au cache du build

---
 .github/workflows/workflow.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 36ffb435b5..3e0c4f6d47 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -17,7 +17,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }} # Cache the entire build Python environment
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
+          restore-keys: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
       - name: Build package
         if: steps.restore-build.outputs.cache-hit != 'true'
         run: make build
@@ -26,7 +27,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-release-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-release-${{ hashFiles('setup.py') }}-${{ github.sha }}
 
   lint-files:
     runs-on: ubuntu-latest
@@ -44,7 +45,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - run: make check-syntax-errors
       - run: make check-style
       - name: Lint Python files
@@ -66,7 +67,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - run: |
           shopt -s globstar
           openfisca test tests/**/*.py
@@ -93,7 +94,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Split YAML tests
         id: yaml-test
         env:
@@ -119,7 +120,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Test the Web API
         run: "${GITHUB_WORKSPACE}/.github/test-api.sh"
 
@@ -177,13 +178,13 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Cache build release
         id: restore-build-release
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-release-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-release-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Upload a Python package to PyPi
         run: twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD
       - name: Publish a git tag
@@ -214,7 +215,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Check api version
         id: check-api-version
         run: python ${GITHUB_WORKSPACE}/.github/check-api-version.py

From 5e23c148edfc1288a77c9e9452aa7d500986fe7a Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Wed, 29 Sep 2021 15:12:19 +0200
Subject: [PATCH 02/14] Supprime la condition du cache hit

---
 .github/workflows/workflow.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 3e0c4f6d47..4a05508293 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -20,7 +20,6 @@ jobs:
           key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
           restore-keys: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
       - name: Build package
-        if: steps.restore-build.outputs.cache-hit != 'true'
         run: make build
       - name: Cache build release
         id: restore-build-release

From 44650670df48bb27265d2f94b83fedbea7bebce9 Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Thu, 30 Sep 2021 08:23:51 +0200
Subject: [PATCH 03/14] =?UTF-8?q?Change=20l'ordre=20des=20expressions=20da?=
 =?UTF-8?q?ns=20la=20cl=C3=A9=20de=20cache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/workflow.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 4a05508293..878959b672 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -17,8 +17,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
-          restore-keys: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }} # Cache the entire build Python environment
+          restore-keys: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}
       - name: Build package
         run: make build
       - name: Cache build release
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-release-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
 
   lint-files:
     runs-on: ubuntu-latest
@@ -44,7 +44,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
       - run: make check-syntax-errors
       - run: make check-style
       - name: Lint Python files
@@ -66,7 +66,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
       - run: |
           shopt -s globstar
           openfisca test tests/**/*.py
@@ -93,7 +93,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
       - name: Split YAML tests
         id: yaml-test
         env:
@@ -119,7 +119,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
       - name: Test the Web API
         run: "${GITHUB_WORKSPACE}/.github/test-api.sh"
 
@@ -177,13 +177,13 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
       - name: Cache build release
         id: restore-build-release
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-release-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
       - name: Upload a Python package to PyPi
         run: twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD
       - name: Publish a git tag
@@ -214,7 +214,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ github.ref }}${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
       - name: Check api version
         id: check-api-version
         run: python ${GITHUB_WORKSPACE}/.github/check-api-version.py

From a993fe5d084a9d4bbc0b8f71b6ae4ca1de8c4c1c Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Thu, 30 Sep 2021 08:25:37 +0200
Subject: [PATCH 04/14] =?UTF-8?q?Ajoute=20des=20cl=C3=A9s=20secondaires=20?=
 =?UTF-8?q?pour=20le=20cache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/workflow.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 878959b672..976ff8c56e 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -18,7 +18,10 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }} # Cache the entire build Python environment
-          restore-keys: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}
+          restore-keys: |
+            ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}
+            ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
+            ${{ env.pythonLocation }}-build-
       - name: Build package
         run: make build
       - name: Cache build release

From 84c0d35784bb6edbf488a7593b309d0bf323e18e Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Thu, 30 Sep 2021 10:02:48 +0200
Subject: [PATCH 05/14] Supprime le step output de check-for-functional-changes

---
 .github/workflows/workflow.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 976ff8c56e..c0e43251dd 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -158,12 +158,11 @@ jobs:
         with:
           python-version: 3.7.12
       - id: stop-early
-        run: if "${GITHUB_WORKSPACE}/.github/has-functional-changes.sh" ; then echo "::set-output name=status::success" ; fi
+        run: "${GITHUB_WORKSPACE}/.github/has-functional-changes.sh"
 
   deploy:
     runs-on: ubuntu-latest
     needs: [ check-for-functional-changes ]
-    if: needs.check-for-functional-changes.outputs.status == 'success'
     env:
       PYPI_USERNAME: openfisca-bot
       PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

From 00d136c9447813c2eeaf1cc55d58552a659a15bf Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Thu, 30 Sep 2021 12:02:45 +0200
Subject: [PATCH 06/14] =?UTF-8?q?Supprime=20le=20nom=20de=20la=20branche?=
 =?UTF-8?q?=20de=20la=20cl=C3=A9=20du=20cache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/workflow.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index c0e43251dd..0fe3738cbf 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -17,9 +17,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }} # Cache the entire build Python environment
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
           restore-keys: |
-            ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}
             ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
             ${{ env.pythonLocation }}-build-
       - name: Build package
@@ -29,7 +28,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
 
   lint-files:
     runs-on: ubuntu-latest
@@ -47,7 +46,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - run: make check-syntax-errors
       - run: make check-style
       - name: Lint Python files
@@ -69,7 +68,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - run: |
           shopt -s globstar
           openfisca test tests/**/*.py
@@ -96,7 +95,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Split YAML tests
         id: yaml-test
         env:
@@ -122,7 +121,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Test the Web API
         run: "${GITHUB_WORKSPACE}/.github/test-api.sh"
 
@@ -179,13 +178,13 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Cache build release
         id: restore-build-release
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Upload a Python package to PyPi
         run: twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD
       - name: Publish a git tag
@@ -216,7 +215,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.ref }}-${{ github.sha }}
+          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Check api version
         id: check-api-version
         run: python ${GITHUB_WORKSPACE}/.github/check-api-version.py

From 54c424a9cfdffcd097ee91779fcb5d05e78b588c Mon Sep 17 00:00:00 2001
From: Hajar AIT EL KADI <48837850+HAEKADI@users.noreply.github.com>
Date: Mon, 18 Oct 2021 09:19:06 +0200
Subject: [PATCH 07/14] Ajoute commentaire

Co-authored-by: Matti Schneider <matti.schneider@beta.gouv.fr>
---
 .github/workflows/workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 0fe3738cbf..aedd4fe517 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
-          restore-keys: |
+          restore-keys: |  # in case of a cache miss (systematically unless the same commit is built repeatedly), the keys below will be used to restore dependencies from previous builds, and the cache will be stored at the end of the job, making up-to-date dependencies available for all jobs of the workflow; see more at https://docs.github.com/en/actions/advanced-guides/caching-dependencies-to-speed-up-workflows#example-using-the-cache-action
             ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
             ${{ env.pythonLocation }}-build-
       - name: Build package

From 1fc010f46c1ee5bd592c131b3faa06323d37df0a Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Mon, 18 Oct 2021 09:28:06 +0200
Subject: [PATCH 08/14] Renomme les caches build et release

---
 .github/workflows/workflow.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index aedd4fe517..20646f9cf7 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -17,10 +17,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
           restore-keys: |  # in case of a cache miss (systematically unless the same commit is built repeatedly), the keys below will be used to restore dependencies from previous builds, and the cache will be stored at the end of the job, making up-to-date dependencies available for all jobs of the workflow; see more at https://docs.github.com/en/actions/advanced-guides/caching-dependencies-to-speed-up-workflows#example-using-the-cache-action
-            ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}
-            ${{ env.pythonLocation }}-build-
+            build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}
+            build-${{ env.pythonLocation }}-
       - name: Build package
         run: make build
       - name: Cache build release
@@ -28,7 +28,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
 
   lint-files:
     runs-on: ubuntu-latest
@@ -46,7 +46,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - run: make check-syntax-errors
       - run: make check-style
       - name: Lint Python files
@@ -68,7 +68,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - run: |
           shopt -s globstar
           openfisca test tests/**/*.py
@@ -95,7 +95,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Split YAML tests
         id: yaml-test
         env:
@@ -121,7 +121,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Test the Web API
         run: "${GITHUB_WORKSPACE}/.github/test-api.sh"
 
@@ -178,13 +178,13 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Cache build release
         id: restore-build-release
         uses: actions/cache@v2
         with:
           path: dist
-          key: ${{ env.pythonLocation }}-release-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Upload a Python package to PyPi
         run: twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD
       - name: Publish a git tag
@@ -215,7 +215,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-build-${{ hashFiles('setup.py') }}-${{ github.sha }}
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
       - name: Check api version
         id: check-api-version
         run: python ${GITHUB_WORKSPACE}/.github/check-api-version.py

From 06ca31e2df05394f9ee7c47846b7ac9980c78fee Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Mon, 18 Oct 2021 09:29:24 +0200
Subject: [PATCH 09/14] Supprime commentaire

---
 .github/workflows/workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 20646f9cf7..77ae9da007 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.pythonLocation }}
-          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }} # Cache the entire build Python environment
+          key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
           restore-keys: |  # in case of a cache miss (systematically unless the same commit is built repeatedly), the keys below will be used to restore dependencies from previous builds, and the cache will be stored at the end of the job, making up-to-date dependencies available for all jobs of the workflow; see more at https://docs.github.com/en/actions/advanced-guides/caching-dependencies-to-speed-up-workflows#example-using-the-cache-action
             build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}
             build-${{ env.pythonLocation }}-

From 3e44abdbc3a553887d7aaf6f85cf70ca2e37ef49 Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Mon, 18 Oct 2021 09:39:08 +0200
Subject: [PATCH 10/14] =?UTF-8?q?Teste=20d=C3=A9ploiement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 77ae9da007..c353dcdf6d 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -144,7 +144,7 @@ jobs:
   # The `deploy` job is dependent on the output of the `check-for-functional-changes`job.
   check-for-functional-changes:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' # Only triggered for the `master` branch
+    if: github.ref == 'refs/heads/build-cache' # Only triggered for the `master` branch
     needs: [ check-version-and-changelog ]
     outputs:
       status: ${{ steps.stop-early.outputs.status }}

From 7adbd3fed92c9286af9cb42ba549f5f36ee4004b Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Mon, 18 Oct 2021 09:46:51 +0200
Subject: [PATCH 11/14] Bump pre-release version

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc8e12780a..97a59b1c49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### 79.0.4-beta.1 [#1685](https://github.com/openfisca/openfisca-france/pull/1685)
+
+* Amélioration technique.
+* Zones impactées : configuration de l'intégration continue.
+  * Détails :
+  - Corrige la gestion des caches dans l'intégration continue
+
 ### 79.0.3 [#1689](https://github.com/openfisca/openfisca-france/pull/1689)
 
 * Évolution du système socio-fiscal.
diff --git a/setup.py b/setup.py
index 7818f13299..6f45ba8431 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name = "OpenFisca-France",
-    version = "79.0.3",
+    version = "79.0.4-beta.1",
     author = "OpenFisca Team",
     author_email = "contact@openfisca.fr",
     classifiers = [

From e00fad34c555c4d24590afabeb8df0b10c7302e1 Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Mon, 18 Oct 2021 10:01:17 +0200
Subject: [PATCH 12/14] Renomme le release cache

---
 .github/workflows/workflow.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index c353dcdf6d..663d789d4e 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -23,8 +23,8 @@ jobs:
             build-${{ env.pythonLocation }}-
       - name: Build package
         run: make build
-      - name: Cache build release
-        id: restore-build-release
+      - name: Cache release
+        id: restore-release
         uses: actions/cache@v2
         with:
           path: dist
@@ -179,8 +179,8 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
-      - name: Cache build release
-        id: restore-build-release
+      - name: Cache release
+        id: restore-release
         uses: actions/cache@v2
         with:
           path: dist

From ff40e35172a5cd3f39d6a9350120c2522a2d3900 Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Mon, 18 Oct 2021 10:02:30 +0200
Subject: [PATCH 13/14] =?UTF-8?q?Met=20=C3=A0=20jour=20le=20changelog=20et?=
 =?UTF-8?q?=20le=20setup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 +-
 setup.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97a59b1c49..b271319a55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-### 79.0.4-beta.1 [#1685](https://github.com/openfisca/openfisca-france/pull/1685)
+### 79.0.4 [#1685](https://github.com/openfisca/openfisca-france/pull/1685)
 
 * Amélioration technique.
 * Zones impactées : configuration de l'intégration continue.
diff --git a/setup.py b/setup.py
index 6f45ba8431..d539ac6cfc 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name = "OpenFisca-France",
-    version = "79.0.4-beta.1",
+    version = "79.0.4",
     author = "OpenFisca Team",
     author_email = "contact@openfisca.fr",
     classifiers = [

From ff79721335b6aac01c5b393cbb1dc4f61e7d1cbc Mon Sep 17 00:00:00 2001
From: HAEKADI <hajar.aitelkadi.o@gmail.com>
Date: Mon, 18 Oct 2021 10:05:14 +0200
Subject: [PATCH 14/14] =?UTF-8?q?R=C3=A9tablit=20la=20condition=20branche?=
 =?UTF-8?q?=20master=20pour=20le=20d=C3=A9ploiement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 663d789d4e..854417e366 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -144,7 +144,7 @@ jobs:
   # The `deploy` job is dependent on the output of the `check-for-functional-changes`job.
   check-for-functional-changes:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/build-cache' # Only triggered for the `master` branch
+    if: github.ref == 'refs/heads/master' # Only triggered for the `master` branch
     needs: [ check-version-and-changelog ]
     outputs:
       status: ${{ steps.stop-early.outputs.status }}