From 3d4d37d98d011ce3481349f4dd9d2bff09edf02a Mon Sep 17 00:00:00 2001 From: Marijn Kruisselbrink Date: Thu, 21 Jan 2021 16:27:44 -0800 Subject: [PATCH 1/2] Use GitHub workflows instead of travis.org for CI and publishing. --- .github/workflows/pr-push.yml | 16 ++++++++ .travis.yml | 17 --------- compile.sh | 9 ----- deploy.sh | 68 ---------------------------------- deploy_key.enc | Bin 3248 -> 0 bytes 5 files changed, 16 insertions(+), 94 deletions(-) create mode 100644 .github/workflows/pr-push.yml delete mode 100644 .travis.yml delete mode 100644 compile.sh delete mode 100644 deploy.sh delete mode 100644 deploy_key.enc diff --git a/.github/workflows/pr-push.yml b/.github/workflows/pr-push.yml new file mode 100644 index 0000000..c25c388 --- /dev/null +++ b/.github/workflows/pr-push.yml @@ -0,0 +1,16 @@ +name: CI +on: + pull_request: {} + push: + branches: [main] + +jobs: + main: + name: Build, Validate and Deploy + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - uses: sidvishnoi/spec-prod@v1 + with: + GH_PAGES_BRANCH: gh-pages + VALIDATE_MARKUP: false diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7a10f74..0000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -sudo: false -language: python -python: -- '3.7' -install: -- pip install pygments lxml setuptools --upgrade -- git clone https://github.com/tabatkins/bikeshed.git -- pip install --editable $PWD/bikeshed -- bikeshed update -script: -- bash "./deploy.sh" - -env: - global: - - ENCRYPTION_LABEL="4571b087bd76" - - COMMIT_AUTHOR_EMAIL="plh+deploy@w3.org" - - DECISION="https://lists.w3.org/Archives/Public/public-webapps/2014JulSep/0627.html" diff --git a/compile.sh b/compile.sh deleted file mode 100644 index 5adde4c..0000000 --- a/compile.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e # Exit with nonzero exit code if anything fails - -bikeshed spec --die-on=everything - -if [ -d out ]; then - echo Copy the generated spec into out/index.html - cp index.html out/index.html -fi diff --git a/deploy.sh b/deploy.sh deleted file mode 100644 index d431a83..0000000 --- a/deploy.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -set -e # Exit with nonzero exit code if anything fails - -# From https://gist.github.com/domenic/ec8b0fc8ab45f39403dd - -SOURCE_BRANCH="master" -TARGET_BRANCH="gh-pages" - -function doCompile { - chmod 755 ./compile.sh - ./compile.sh -} - -# Pull requests and commits to other branches shouldn't try to deploy, just build to verify -if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then - echo "Skipping deploy; just doing a build." - doCompile - exit 0 -fi - -# Save some useful information -REPO=`git config remote.origin.url` -SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:} -SHA=`git rev-parse --verify HEAD` - -# Clone the existing gh-pages for this repo into out/ -# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deply) -git clone $REPO out -cd out -git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH -cd .. - -# Clean out existing contents -rm -rf out/**/* || exit 0 - -# Run our compile script -doCompile - -# Now let's go have some fun with the cloned repo -cd out -git config user.name "Travis CI" -git config user.email "$COMMIT_AUTHOR_EMAIL" - -# If there are no changes to the compiled out (e.g. this is a README update) then just bail. -if git diff --quiet; then - echo "No changes to the output on this push; exiting." - exit 0 -fi - -# Commit the "changes", i.e. the new version. -# The delta will show diffs between new and old versions. -git add -A . -git commit -m "Deploy to GitHub Pages: ${SHA}" - -# Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc -ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" -ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" -ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} -ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} -openssl aes-256-cbc -K $encrypted_4571b087bd76_key -iv $encrypted_4571b087bd76_iv -in ../deploy_key.enc -out ../deploy_key -d -chmod 600 ../deploy_key -eval `ssh-agent -s` -ssh-add ../deploy_key - -# Now that we're all set up, we can push. -git push $SSH_REPO $TARGET_BRANCH -git checkout $SOURCE_BRANCH -bikeshed echidna --md-status=WD --u $USER --p $PASS --decision $DECISION --cc=marcos@marcosc.com diff --git a/deploy_key.enc b/deploy_key.enc deleted file mode 100644 index b6d35b92274ae826bc9bba981e7fa4da886629fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3248 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 From 9f0ea2441bc8f4b2b1c4006403a394c0ceedb90a Mon Sep 17 00:00:00 2001 From: "Michael[tm] Smith" Date: Mon, 19 Apr 2021 17:49:19 +0900 Subject: [PATCH 2/2] Update .github/workflows/pr-push.yml --- .github/workflows/pr-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-push.yml b/.github/workflows/pr-push.yml index c25c388..26ce864 100644 --- a/.github/workflows/pr-push.yml +++ b/.github/workflows/pr-push.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: sidvishnoi/spec-prod@v1 + - uses: w3c/spec-prod@v2 with: GH_PAGES_BRANCH: gh-pages VALIDATE_MARKUP: false