Skip to content

Commit

Permalink
Merge pull request #51 from ocefpaf/workaround_zipfile
Browse files Browse the repository at this point in the history
workaround actions/upload-artifact#38

I think I'm still missing something, but I don't see any negative consequences. Plus, when you tell me it's ready to merge, I merge! Ok, most of the time ...
  • Loading branch information
emiliom authored Mar 23, 2020
2 parents 44d3413 + eaf1ecb commit a060927
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/check_jekyll_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,26 @@ on:
branches: [ master ]

jobs:
# Job to test that web pages build
jekyll_build:
name: Jekyll build of web pages
runs-on: ubuntu-latest

steps:
# https://github.com/actions/checkout
- name: Checkout
uses: actions/checkout@v2

# https://github.com/marketplace/actions/build-jekyll
- name: Build with Jekyll
uses: jerryjvl/jekyll-build-action@v1

# workaround https://github.com/actions/upload-artifact/issues/38
- name: tarball
run: tar czf site.tar.gz ./_site/

# https://github.com/actions/upload-artifact
- name: Upload Website artifact
uses: actions/upload-artifact@v1
with:
name: Website
path: ./_site/
path: site.tar.gz
13 changes: 13 additions & 0 deletions .github/workflows/jekyll-diff.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# https://github.com/David-Byrne/jekyll-diff-action

name: Jekyll diff
on: [push]

jobs:
diff-site:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: David-Byrne/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion _pages/01-applicants.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image: ohw18-hacking2.JPG

In Oceanhackweek we will explore the intersection of data science and oceanography through tutorials and hands-on “hacking” projects. In tutorials, we will learn data science tools, cloud computing, visualization, and a suite of software assets to interact with data sets of complex temporal-spatial structures or high volume. In project sessions, we will immediately put these skills to use by implementing research, computation, or visualization ideas in a group setting. To best benefit from the program, participant are expected to have some experience with Python programming and data analysis.

If you are ready to apply, please use the application form [https://form.jotform.com/oceanhack/2019](https://form.jotform.com/oceanhack/2019)
If you are ready to apply, please use the application form [https://form.jotform.com/oceanhack/2020](https://form.jotform.com/oceanhack/2020)


---
Expand Down

2 comments on commit a060927

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--- /jekyll-diff-action/old/applicant-info.html
+++ /jekyll-diff-action/new/applicant-info.html
@@ -86 +86 @@
-<p>If you are ready to apply, please use the application form <a href="https://form.jotform.com/oceanhack/2019">https://form.jotform.com/oceanhack/2019</a></p>
+<p>If you are ready to apply, please use the application form <a href="https://form.jotform.com/oceanhack/2020">https://form.jotform.com/oceanhack/2020</a></p>

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--- /jekyll-diff-action/old/applicant-info.html
+++ /jekyll-diff-action/new/applicant-info.html
@@ -86 +86 @@
-<p>If you are ready to apply, please use the application form <a href="https://form.jotform.com/oceanhack/2019">https://form.jotform.com/oceanhack/2019</a></p>
+<p>If you are ready to apply, please use the application form <a href="https://form.jotform.com/oceanhack/2020">https://form.jotform.com/oceanhack/2020</a></p>

Please sign in to comment.