diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml new file mode 100644 index 00000000..56586d05 --- /dev/null +++ b/.github/workflows/pages.yml @@ -0,0 +1,64 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# Sample workflow for building and deploying a Jekyll site to GitHub Pages +name: Deploy Jekyll site to Pages + +on: + push: + branches: ["master"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow one concurrent deployment +concurrency: + group: "pages" + cancel-in-progress: true + +jobs: + # Build job + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.1' # Not needed with a .ruby-version file + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + cache-version: 0 # Increment this number if you need to re-download cached gems + - name: Setup Pages + id: pages + uses: actions/configure-pages@v2 + - name: Build with Jekyll + # Outputs to the './_site' directory by default + run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" + env: + JEKYLL_ENV: production + - name: List generated site files + run: ls -la _site + - name: Upload artifact + # Automatically uploads an artifact from the './_site' directory by default + uses: actions/upload-pages-artifact@v3.0.1 + + # Deployment job + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4.0.5 diff --git a/.gitignore b/.gitignore index f8d477be..dac6e866 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ _site/ .jekyll-cache/ _config-claire.yml Gemfile.lock +code/plugins/github/ +.*/.DS_Store +.DS_Store diff --git a/Gemfile b/Gemfile index 9085a7e4..df9cbac8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,10 @@ source "https://rubygems.org" -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -gem "jekyll", "~> 4.1.1" + +gem "jekyll", "~> 4.3.3" + # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "just-the-docs", github:"pmarsceill/just-the-docs" +#gem "just-the-docs", github:"pmarsceill/just-the-docs" +gem "just-the-docs", "~> 0.8.2" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. # gem "github-pages", group: :jekyll_plugins @@ -21,13 +16,13 @@ end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library. -platforms :mingw, :x64_mingw, :mswin, :jruby do - gem "tzinfo", "~> 1.2" - gem "tzinfo-data" -end +#platforms :mingw, :x64_mingw, :mswin, :jruby do + #gem "tzinfo", "~> 1.2" + #gem "tzinfo-data" +#end # Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] +#gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] gem "webrick", "~> 1.7" diff --git a/Graveyard/00_release_instructions.md b/Graveyard/00_release_instructions.md index 71534306..ddea3d1e 100644 --- a/Graveyard/00_release_instructions.md +++ b/Graveyard/00_release_instructions.md @@ -2,13 +2,14 @@ 1. Check that there is no bug in the unit test cases 2. Update the revision page at https://eeglab.org/others/EEGLAB_revision_history.html -3. Change version number and date in eeg_getversion.m -4. Compile as Windows and Mac, and check automated test (menu item "test compiled version") -5. Manually upload and update links in /home/www/eeglab/eeglabversions (zip archive can have the extension rc for release candidate) -6. Compile as Matlab with rc (release candidate), plugin will automatically be submitted. -7. Check automated install by changing the EEGLAB preferences. -8. Create a new branch for the old version (use GIT) -9. Issue release candidate email to EEGLABLIST list with direct link to executables +3. Change the version number and date in eeg_getversion.m +4. Create the release candidate usign maketoolboxgit20xx +5. Compile as Windows and Mac, and check automated test (menu item "test compiled version") +6. Manually upload and update links in /home/www/eeglab/eeglabversions (zip archive can have the extension rc for release candidate) +7. Compile as Matlab with rc (release candidate), plugin will automatically be submitted. +8. Check the automated installation by changing the EEGLAB preferences. +9. Create a new branch for the old version (use GIT) +10. Issue release candidate email to EEGLABLIST list with direct link to executables ## Final candidate @@ -19,9 +20,10 @@ One week later after release candidate. 2. Change revision 3. Accept plugin. 4. Accept new plugin and check that update is seen. -5. Final edits in the revision page -6. Unpate links in /home/arno/www/eeglab/currentversion -7. Send email to EEGLABNEWS list +5. Run "test_compiled_version" script +6. Final edits in the revision page +7. Update links in /home/arno/www/eeglab/currentversion +8. Send email to EEGLABNEWS list ## Post release diff --git a/Graveyard/BESA_(outdated).md b/Graveyard/BESA_(outdated).md index 1490c13c..4f5711e3 100644 --- a/Graveyard/BESA_(outdated).md +++ b/Graveyard/BESA_(outdated).md @@ -1,9 +1,11 @@ --- layout: default --- -DIPFIT vs BESA study using the spherical head model +DIPFIT vs. BESA study using the spherical head model -------- +[statistics](Statistics.md) + We (AD) checked the results of fitting equivalent dipoles with DIPFIT (spherical model) against results of BESA(3.0) for independent components of data recorded in a working memory task in our laboratory. @@ -66,4 +68,4 @@ Brainstorm which is an approximation (Dipfit uses an exact computation, albeit a series expansion that is truncated by default at order 60). It would be -worth to compare the results of this function with the result of Dipfit. \ No newline at end of file +worth to compare the results of this function with the result of Dipfit. diff --git a/_config.yml b/_config.yml index 1af63406..3cefe13f 100644 --- a/_config.yml +++ b/_config.yml @@ -28,7 +28,9 @@ twitter_username: jekyllrb github_username: jekyll # Build settings -remote_theme: pmarsceill/just-the-docs +#remote_theme: just-the-docs/just-the-docs +theme: just-the-docs +url: https://eeglab.org plugins: - jekyll-feed color_scheme: eeglab diff --git a/_layouts/default.html b/_layouts/default.html index e21b41e4..13446740 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -58,11 +58,11 @@ {% if collections_size > 1 %}
{{ collection_value.name }}
{% endif %} - {% include nav.html pages=collection %} + {% include components/nav.html pages=collection %} {% endif %} {% endfor %} {% else %} - {% include nav.html pages=site.html_pages %} + {% include components/nav.html pages=site.html_pages %} {% endif %}