From 7deb973d47e31521b1e3c9732010ac97a87cd149 Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Tue, 24 Nov 2020 15:52:32 -0500 Subject: [PATCH 1/7] playing with Github actions --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..3df11a0 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build-and-Deploy + +# Run this workflow every time a new commit pushed to your repository +on: push + +jobs: + # Set the job key. The key is displayed as the job name + # when a job name is not provided + super-lint: + # Name the Job + name: Lint code base + # Set the type of machine to run on + runs-on: ubuntu-latest + + steps: + # Checks out a copy of your repository on the ubuntu-latest machine + - name: Checkout code + uses: actions/checkout@v2 + + # Runs the Super-Linter action + - name: Run Super-Linter + uses: github/super-linter@v3 + env: + DEFAULT_BRANCH: main + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -- GitLab From 66341b40f4829804229f56fe6ab7b2435fabd3a9 Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Tue, 24 Nov 2020 16:09:29 -0500 Subject: [PATCH 2/7] Build --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3df11a0..3a78f9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: # when a job name is not provided super-lint: # Name the Job - name: Lint code base + name: Build Sphinx manual HTML target # Set the type of machine to run on runs-on: ubuntu-latest @@ -18,8 +18,8 @@ jobs: uses: actions/checkout@v2 # Runs the Super-Linter action - - name: Run Super-Linter - uses: github/super-linter@v3 + - name: Build MFiX-Exa HTML manual + run: make -C docs env: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -- GitLab From 0d42bf2ca9838f39201e8e5960e94a05f4cc48d6 Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Tue, 24 Nov 2020 16:12:19 -0500 Subject: [PATCH 3/7] Install deps --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a78f9e..5a9d80a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,11 +13,15 @@ jobs: runs-on: ubuntu-latest steps: - # Checks out a copy of your repository on the ubuntu-latest machine + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install sphinx sphinx-rtd-theme + - name: Checkout code uses: actions/checkout@v2 - # Runs the Super-Linter action - name: Build MFiX-Exa HTML manual run: make -C docs env: -- GitLab From 9b30272e9f1021ff7d117cef01d1b279cf1643f4 Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Tue, 24 Nov 2020 16:13:17 -0500 Subject: [PATCH 4/7] Cleanup --- .travis.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b9ec906..0000000 --- a/.travis.yml +++ /dev/null @@ -1,31 +0,0 @@ -dist: xenial - -language: generic - -python: - - 3.6 - -install: - - python -m pip install --user sphinx sphinx-rtd-theme - -script: bash ./build_and_deploy.sh - -env: - global: - - COMMIT_AUTHOR_EMAIL: "jpblaschke@lbl.gov" - -addons: - apt: - packages: - - doxygen - -deploy: - provider: pages - target-branch: gh-pages - local-dir: docs/webroot - skip-cleanup: true - github-token: $GITHUB_TOKEN # Set in travis-ci.org dashboard, marked secure - keep-history: true - verbose: true - on: - branch: master -- GitLab From 1fef97c95f93369a78000631d2c2238a23f7b8b6 Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Tue, 24 Nov 2020 16:14:30 -0500 Subject: [PATCH 5/7] simplify --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a9d80a..4ccc754 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,9 +15,7 @@ jobs: steps: - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install sphinx sphinx-rtd-theme + run: pip install sphinx sphinx-rtd-theme - name: Checkout code uses: actions/checkout@v2 -- GitLab From 35f5b81952ed57b8730deca094e168d964b97ef4 Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Mon, 7 Dec 2020 15:27:43 -0500 Subject: [PATCH 6/7] Add secret --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ccc754..31be9cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,4 +24,4 @@ jobs: run: make -C docs env: DEFAULT_BRANCH: main - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }} -- GitLab From d67f6108bf9bf7f8018851dc7c49df9b8d2ce73d Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Mon, 7 Dec 2020 15:38:44 -0500 Subject: [PATCH 7/7] Add Doxygen --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31be9cd..9e8f1f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,8 +13,10 @@ jobs: runs-on: ubuntu-latest steps: + - name: Install Doxygen + run: sudo apt install doxygen - - name: Install dependencies + - name: Install Sphinx run: pip install sphinx sphinx-rtd-theme - name: Checkout code -- GitLab