From 750f06816303906e1eb6636253ed6d1456106ec3 Mon Sep 17 00:00:00 2001 From: Niklas Hasselmeyer Date: Mon, 23 Aug 2021 11:44:26 +0200 Subject: [PATCH] Migrate from Travis CI to Github Actions --- .github/workflows/test.yml | 44 +++++++++++++++++++++++++++++++++++ .ruby-version | 2 +- .travis.yml | 32 ------------------------- Gemfile.rails-3.2.lock | 2 +- Gemfile.rails-4.2.haml-4.lock | 2 +- Gemfile.rails-4.2.haml-5.lock | 2 +- Gemfile.rails-5.1.haml-4.lock | 2 +- Gemfile.rails-5.1.haml-5.lock | 2 +- README.md | 2 +- 9 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 .github/workflows/test.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..7601172 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,44 @@ +--- +name: Tests +'on': + push: + branches: + - master + pull_request: + branches: + - master +jobs: + test: + runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: + include: + - ruby: 2.3.5 + gemfile: Gemfile.rails-3.2 + - ruby: 2.3.5 + gemfile: Gemfile.rails-4.2.haml-4 + - ruby: 2.3.5 + gemfile: Gemfile.rails-4.2.haml-5 + - ruby: 2.3.5 + gemfile: Gemfile.rails-5.1.haml-4 + - ruby: 2.3.5 + gemfile: Gemfile.rails-5.1.haml-5 + - ruby: 2.7.2 + gemfile: Gemfile.rails-5.1.haml-4 + - ruby: 2.7.2 + gemfile: Gemfile.rails-5.1.haml-5 + env: + BUNDLE_GEMFILE: "${{ matrix.gemfile }}" + steps: + - uses: actions/checkout@v2 + - name: Install ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: "${{ matrix.ruby }}" + - name: Bundle + run: | + gem install bundler:2.1.4 + bundle install --no-deployment + - name: Run tests + run: bundle exec rspec diff --git a/.ruby-version b/.ruby-version index cc6c9a4..37c2961 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.5 +2.7.2 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bfd0cb6..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: ruby - -sudo: false - -rvm: - - "2.1.2" - - "2.3.5" - -gemfile: - - Gemfile.rails-3.2 - - Gemfile.rails-4.2.haml-4 - - Gemfile.rails-4.2.haml-5 - - Gemfile.rails-5.1.haml-4 - - Gemfile.rails-5.1.haml-5 - -dist: trusty - -cache: bundler - -install: - # Replace default Travis CI bundler script with a version that doesn't - # explode when lockfile doesn't match recently bumped version - - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle} - -script: bundle exec rake current_rspec - -matrix: - exclude: - - gemfile: Gemfile.rails-5.1.haml-4 - rvm: "2.1.2" - - gemfile: Gemfile.rails-5.1.haml-5 - rvm: "2.1.2" diff --git a/Gemfile.rails-3.2.lock b/Gemfile.rails-3.2.lock index d1eca58..615f496 100644 --- a/Gemfile.rails-3.2.lock +++ b/Gemfile.rails-3.2.lock @@ -28,7 +28,7 @@ GEM concurrent-ruby (1.0.5) diff-lcs (1.3) erubis (2.7.0) - gemika (0.3.2) + gemika (0.6.1) haml (4.0.2) tilt hike (1.2.3) diff --git a/Gemfile.rails-4.2.haml-4.lock b/Gemfile.rails-4.2.haml-4.lock index 1c72545..172f6fb 100644 --- a/Gemfile.rails-4.2.haml-4.lock +++ b/Gemfile.rails-4.2.haml-4.lock @@ -31,7 +31,7 @@ GEM crass (1.0.3) diff-lcs (1.3) erubis (2.7.0) - gemika (0.3.2) + gemika (0.6.1) haml (4.0.7) tilt i18n (0.9.1) diff --git a/Gemfile.rails-4.2.haml-5.lock b/Gemfile.rails-4.2.haml-5.lock index 159bb7a..f862a9e 100644 --- a/Gemfile.rails-4.2.haml-5.lock +++ b/Gemfile.rails-4.2.haml-5.lock @@ -31,7 +31,7 @@ GEM crass (1.0.3) diff-lcs (1.3) erubis (2.7.0) - gemika (0.3.2) + gemika (0.6.1) haml (5.0.4) temple (>= 0.8.0) tilt diff --git a/Gemfile.rails-5.1.haml-4.lock b/Gemfile.rails-5.1.haml-4.lock index 97463a4..91c73b2 100644 --- a/Gemfile.rails-5.1.haml-4.lock +++ b/Gemfile.rails-5.1.haml-4.lock @@ -31,7 +31,7 @@ GEM crass (1.0.3) diff-lcs (1.3) erubi (1.7.0) - gemika (0.3.2) + gemika (0.6.1) haml (4.0.7) tilt i18n (0.9.1) diff --git a/Gemfile.rails-5.1.haml-5.lock b/Gemfile.rails-5.1.haml-5.lock index ee2f293..461d409 100644 --- a/Gemfile.rails-5.1.haml-5.lock +++ b/Gemfile.rails-5.1.haml-5.lock @@ -31,7 +31,7 @@ GEM crass (1.0.3) diff-lcs (1.3) erubi (1.7.0) - gemika (0.3.2) + gemika (0.6.1) haml (5.0.4) temple (>= 0.8.0) tilt diff --git a/README.md b/README.md index 6171550..bb08c54 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -angular_xss [![Build Status](https://travis-ci.org/makandra/angular_xss.png?branch=master)](https://travis-ci.org/makandra/angular_xss) +angular_xss [![Build Status](https://github.com/makandra/angular_xss/workflows/Tests/badge.svg)](https://github.com/makandra/angular_xss/actions) =========== When rendering AngularJS templates with a server-side templating engine like ERB or Haml it is easy to introduce XSS vulnerabilities. These vulnerabilities are enabled by AngularJS evaluating user-provided strings containing interpolation symbols (default symbols are `{{` and `}}`).