diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..8b60055 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,27 @@ +name: Deploy Wiki Adire Site + +on: + release: + # Only use the types keyword to narrow down the activity types that will trigger your workflow. + types: [published] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-ruby@v1 + with: + ruby-version: '2.x' + - name: Build + run: | + docker run \ + -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ + jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" + - name: Deploy + run: bash deploy + env: + S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml new file mode 100644 index 0000000..df8f6f6 --- /dev/null +++ b/.github/workflows/jekyll.yml @@ -0,0 +1,16 @@ +name: Wiki Adire Site + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Build the site in the jekyll/builder container + run: | + docker run \ + -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ + jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b6df6dd..0000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: ruby -rvm: - - 2.4.1 -jdk: - - openjdk9 - -before_script: - - chmod +x ./script/cibuild - - chmod +x deploy - -script: ./script/cibuild - -env: - global: - - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer - -addons: - apt: - packages: - - libcurl4-openssl-dev - -sudo: false # route your build to the container-based infrastructure for a faster build - -cache: bundler # caching bundler gem packages will speed up build - -# Optional: disable email notifications about the outcome of your builds -notifications: - email: false - -deploy: - provider: script - script: bash deploy - skip_cleanup: true - on: - tags: true diff --git a/Readme.md b/Readme.md index ca7e65d..013d5fc 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,7 @@ # Site wiki.adire.eu.com -[![Build Status](https://travis-ci.org/fauguste/wiki.adire.eu.com.svg?branch=master)](https://travis-ci.org/fauguste/wiki.adire.eu.com) +[![Build Status](https://github.com/fauguste/wiki.adire.eu.com/workflows/Wiki Adire Site/badge.svg) + [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Ffauguste%2Fwiki.adire.eu.com.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Ffauguste%2Fwiki.adire.eu.com?ref=badge_shield) ## Prérequis @@ -14,4 +15,4 @@ bundle exec jekyll serve ## License -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Ffauguste%2Fwiki.adire.eu.com.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Ffauguste%2Fwiki.adire.eu.com?ref=badge_large) \ No newline at end of file +[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Ffauguste%2Fwiki.adire.eu.com.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Ffauguste%2Fwiki.adire.eu.com?ref=badge_large) diff --git a/pages/git/branch.md b/pages/git/branch.md index 1531be7..b3325f7 100644 --- a/pages/git/branch.md +++ b/pages/git/branch.md @@ -15,6 +15,6 @@ menus: git git branch -D BRANCH_NAME -## Suppression des toutes les branches locales n'existant plus sur le serveur +## Suppression des toutes les branches locales git branch | grep -v "master" | xargs git branch -D