From daf7a01537ac888a5ca6db9c5ac667e4dbf91e28 Mon Sep 17 00:00:00 2001
From: Richard Hallett <richard@richardhallett.com>
Date: Wed, 14 Feb 2024 14:16:27 +0100
Subject: [PATCH] Fix PR workflow

---
 .github/workflows/pull_request.yml | 64 ++----------------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index aa5b47c..e626dd7 100755
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -3,66 +3,8 @@ on:
   pull_request:
     branches:
       - master
+
 jobs:
   test:
-    runs-on: ubuntu-latest
-    services:
-      memcached:
-        image: memcached:1.4.31
-        ports:
-          - 11211/udp
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_DATABASE: sashimi_test
-          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-        ports:
-          - 3306
-      redis:
-        image: redis:6
-        ports:
-          - 6379:6379
-
-    env:
-      MEMCACHE_SERVERS: "localhost:11211"
-      MYSQL_HOST: "127.0.0.1"
-      MYSQL_DATABASE: sashimi_test
-      MYSQL_USER: root
-      SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }}
-      SESSION_ENCRYPTED_COOKIE_SALT: ${{ secrets.SESSION_ENCRYPTED_COOKIE_SALT }}
-      JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
-      JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
-      AWS_REGION: ${{ secrets.AWS_REGION }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: '2.6.x'
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-      - name: Install
-        env:
-          MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
-        run: |
-          cp .env.build .env
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-          sudo /etc/init.d/mysql start
-          bundle exec rake db:setup RAILS_ENV=test
-      - name: Lint and Test
-        env:
-          MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
-          MEMCACHE_SERVERS: "localhost:11211"
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_S3_BUCKET: 'metrics-api.stage.datacite.org'
-        run: |
-          # bundle exec rubocop
-          bundle exec rspec
-          echo $?
+    uses: ./.github/workflows/test.yml
+    secrets: inherit
\ No newline at end of file