Un projet r\u00e9cent sur lequel je travaille dispose d’une branche, qui, lorsque celle-ci re\u00e7oit des modifications, d\u00e9clenche un \u00e9v\u00e9nement dans notre syst\u00e8me de d\u00e9ploiement continue, afin de d\u00e9ployer le contenu de la branche sur notre environnement de d\u00e9veloppement. Avec l’augmentation des effectifs de d\u00e9veloppeurs sur le projet, et pour essayer de garder un environnement de d\u00e9veloppement le plus \u00e0 jour possible et faciliter le test des nouvelles fonctionnalit\u00e9s ou des corrections, je me suis pench\u00e9 sur la question de la fusion automatique de branches avec les Github Actions.<\/p>\n\n\n\n
Voici un exemple de configuration fonctionnelle:<\/p>\n\n\n\n
name: auto-merge\non:\n workflow_dispatch:\n schedule:\n # * is a special character in YAML so you have to quote this string\n <\/em>- cron: '0 7 * * 1-5'\njobs:\n build:\n runs-on: ubuntu-latest\n steps:\n - uses: actions\/checkout@v2\n with:\n ref: master\n fetch-depth: 0\n - name: Merge on dev-env\n run: |\n git config user.name github-actions\n git config user.email github-actions@github.com\n git config --global pull.ff only\n git checkout dev-env\n git pull\n git merge master\n git push<\/pre>\n\n\n\nDans cet exemple, tous les jours du lundi au vendredi \u00e0 7h, la branche
master<\/code> sera fusionn\u00e9e dans la branchedev-env<\/code> et pouss\u00e9e dans le d\u00e9p\u00f4t distant, d\u00e9clenchant ainsi le processus de d\u00e9ploiement automatis\u00e9.<\/p>\n","protected":false},"excerpt":{"rendered":"Un projet r\u00e9cent sur lequel je travaille dispose d’une branche, qui, lorsque celle-ci re\u00e7oit des modifications, d\u00e9clenche un \u00e9v\u00e9nement dans notre syst\u00e8me de d\u00e9ploiement continue, afin de d\u00e9ployer le contenu de la branche sur notre environnement de d\u00e9veloppement. Avec l’augmentation des effectifs de d\u00e9veloppeurs sur le projet, et pour essayer de garder un environnement de … Continuer la lecture de « Fusion automatique de branches avec Github Actions »<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[40],"tags":[14,588,587,589],"class_list":["post-4579","post","type-post","status-publish","format-standard","hentry","category-info","tag-github","tag-github-actions","tag-merge","tag-schedule"],"_links":{"self":[{"href":"https:\/\/www.unicoda.com\/index.php?rest_route=\/wp\/v2\/posts\/4579","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.unicoda.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.unicoda.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.unicoda.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.unicoda.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4579"}],"version-history":[{"count":2,"href":"https:\/\/www.unicoda.com\/index.php?rest_route=\/wp\/v2\/posts\/4579\/revisions"}],"predecessor-version":[{"id":4581,"href":"https:\/\/www.unicoda.com\/index.php?rest_route=\/wp\/v2\/posts\/4579\/revisions\/4581"}],"wp:attachment":[{"href":"https:\/\/www.unicoda.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4579"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.unicoda.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4579"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.unicoda.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4579"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}