diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml deleted file mode 100644 index 57368cf..0000000 --- a/.github/workflows/lint.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: Ruby - -on: - push: - branches: [ master ] - pull_request: - branches: [ '**' ] - -jobs: - lint: - runs-on: ubuntu-latest - env: - RUBY_VERSION: "3.3" - name: Rubocop - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Setup Ruby w/ same version as image - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.3" - - name: Install dependencies - run: | - gem install dip - dip bundle install - - name: Run linter - run: dip rubocop diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 848b033..ef37493 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,6 +7,25 @@ on: branches: [ '**' ] jobs: + lint: + runs-on: ubuntu-latest + env: + RUBY_VERSION: "3.3" + name: Rubocop + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Setup Ruby w/ same version as image + uses: ruby/setup-ruby@v1 + with: + ruby-version: "3.3" + - name: Install dependencies + run: | + gem install dip + dip bundle install + - name: Run linter + run: dip rubocop + test: runs-on: ubuntu-latest strategy: