Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dash] Setup use of site-shared, drop local copies of setup files #1256

Merged
merged 2 commits into from
Sep 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "site-shared"]
path = site-shared
url = https://github.com/dart-lang/site-shared.git
branch = chalin-zsh-0810
27 changes: 13 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,21 @@ addons:
- lib32stdc++6
- libstdc++6

cache:
timeout: 1000
bundler: true
directories:
- $HOME/.pub-cache
- $HOME/.nvm
- $HOME/.rvm
- node_modules

env:
global:
- JEKYLL_ENV=production
- TZ=US/Pacific # normalize build timestamp
matrix:
- TASK="./tool/check-examples.sh"
# SKIP link checking until we can get linkcheck running
- TASK="./tool/check-code.sh"
- TASK="bundle exec jekyll build"

before_install:
Expand All @@ -26,16 +34,16 @@ before_install:

install:
- ./tool/install.sh
# - ./tool/write-ci-info.sh -v
# - ./tool/shared/write-ci-info.sh -v

script: $TASK

after_script:
- if [[ $TASK == *build* ]]; then ./tool/check-links.sh || travis_terminate 1; fi
- if [[ $TASK == *build* ]]; then ./tool/shared/check-links.sh || travis_terminate 1; fi

deploy:
- provider: script
script: ./tool/deploy.sh dash # TODO: drop dash
script: ./tool/shared/deploy.sh dash # TODO: drop dash
skip_cleanup: true
on:
repo: flutter/website
Expand All @@ -45,12 +53,3 @@ deploy:
# Only run Travis jobs for named branches (to avoid double builds for each PR)
branches:
only: [master, dash, /^\d\.x$/, /^\d-dev$/, /travis-build/]

cache:
timeout: 1000
bundler: true
directories:
- $HOME/.pub-cache
- $HOME/.nvm
- $HOME/.rvm
- node_modules
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ if you already have the required packages installed.
- `bundle exec jekyll serve --incremental --watch --livereload --port 4002`

1. Prior to submitting, run link validation:<br>
`tool/check-links.sh`
`tool/shared/check-links.sh`

## Deploy to a staging site

Expand Down
6 changes: 5 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ defaults:

# Build settings
source: src
# `symlinked-sources` can refer to individual files or directories
# under `src` that are symlinked to somewhere outside `src`, or it can
# refer to the root folder of the symlinked content (like `site-shared/src`):
symlinked-sources: [site-shared/src]

plugins:
- jekyll-redirect-from
- jekyll-redirect-from # TODO(chalin): drop this in favor of Firebase redirects

## Site-wide shorthands

Expand Down
1 change: 1 addition & 0 deletions site-shared
Submodule site-shared added at 95a80a
1 change: 1 addition & 0 deletions src/_assets/images/shared
9 changes: 0 additions & 9 deletions src/_plugins/regex_replace_filter.rb

This file was deleted.

1 change: 1 addition & 0 deletions src/_plugins/regex_replace_filter.rb
1 change: 1 addition & 0 deletions src/_plugins/symlinked_sources_listener.rb
1 change: 1 addition & 0 deletions tool/before-install.sh
File renamed without changes.
57 changes: 0 additions & 57 deletions tool/check-links.sh

This file was deleted.

42 changes: 0 additions & 42 deletions tool/deploy.sh

This file was deleted.

17 changes: 2 additions & 15 deletions tool/env-set.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
# This bash file is meant to be source'd, not executed.
# This bash file is meant to be source'd from the repo root, not executed.

source tool/shared/env-set.sh

# Temporary, until we start using site-shared:

# nvm install 10
# nvm use 10
# rvm install 2.4.3
# rvm use 2.4.3

# function travis_fold () { true; }
# export -f travis_fold

# : ${TMP:=tmp}
# [[ -e "$TMP" ]] || mkdir -pv "$TMP"

# Site specific settings here: currently, none.
# Site-specific settings here: currently, none.
30 changes: 0 additions & 30 deletions tool/install.sh

This file was deleted.

1 change: 1 addition & 0 deletions tool/install.sh
70 changes: 0 additions & 70 deletions tool/serve.sh

This file was deleted.

1 change: 1 addition & 0 deletions tool/serve.sh
1 change: 1 addition & 0 deletions tool/shared
Loading