diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 391fb80..99e9559 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -8,28 +8,18 @@ jobs: runs-on: workiva-runner-dev steps: - uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1 with: sdk: stable - - run: dart pub get - - uses: Workiva/gha-dart/dart-format@master + - run: dart run dart_dev format dependency-validator: runs-on: workiva-runner-dev steps: - uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1 with: sdk: stable - - run: dart pub get - - # TODO: convert to Workiva/gha-dart/dart-dependency-validator@master once - # https://github.com/Workiva/gha-dart/pull/4 merges - - run: dart run dependency_validator - shell: bash - - \ No newline at end of file + - run: dart run dependency_validator \ No newline at end of file diff --git a/.github/workflows/scip.yaml b/.github/workflows/scip.yaml deleted file mode 100644 index 6d48db5..0000000 --- a/.github/workflows/scip.yaml +++ /dev/null @@ -1,48 +0,0 @@ -name: Scip - -on: - pull_request: - push: - branches: - - master - -permissions: - contents: read - id-token: write - - -# TODO: replace this implementation with gha-dart once this: -# https://github.com/Workiva/gha-dart/pull/7 merges -jobs: - index: - runs-on: workiva-runner-dev - steps: - - uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1 - with: - sdk: 2.18.7 - - - run: dart pub get - - - run: dart pub global activate -spath . - - - name: scip index - run: dart pub global run scip_dart ./ - - # provides SRC_ENDPOINT and SRC_ACCESS_TOKEN to the src installation step - - uses: Workiva/gha-setup-credentials@v1.0.0 - with: - vault-url: https://vault-dev.workiva.org - vault-env: dev - - # Install src cli - - name: Install Sourcegraph CLI - run: | - curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o _src-cli - chmod +x _src-cli - ./_src-cli login - echo ./_src-cli endpoint $SRC_ENDPOINT - echo ./_src-cli access token $SRC_ACCESS_TOKEN - - - name: Upload scip to sourcegraph - run: ./_src-cli code-intel upload -file=index.scip -github-token="${{ env.FEF_GH_TOKEN }}" \ No newline at end of file diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ee8f3cb..5f0ef2c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -9,9 +9,7 @@ on: jobs: snapshots: - runs-on: workiva-runner-dev - name: Snapshots - + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Install scip cli @@ -21,17 +19,14 @@ jobs: - uses: dart-lang/setup-dart@v1 with: + # use a fixed version number so changes to 'stable', dont break snapshot diffs (language version is used in the scip symbol) sdk: 2.18.7 - - # run `pub get` for the scip-dart package - - name: Pub get cli - uses: Workiva/gha-dart/pub-get@master + - name: pub get scip-dart package + run: dart pub get - # run `pub get` for `snapshots` - - name: Pub get snapshots dir - uses: Workiva/gha-dart/pub-get@master - with: - package-path: ./snapshots/input/basic-project + - name: pub get snapshots directory + run: dart pub get + working-directory: ./snapshots/input/basic-project - name: Snapshots Diff Check run: | @@ -50,29 +45,25 @@ jobs: fi consumer: - runs-on: workiva-runner-dev - name: Consumer + runs-on: ubuntu-latest strategy: matrix: - repo: ["Workiva/wdesk_sdk", "Workiva/syncdeps_dart"] + repo: ["Workiva/over_react", "rrousselGit/provider", "dart-lang/args"] steps: # Setup scip-dart - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1 - with: - sdk: 2.18.7 - uses: Workiva/gha-dart/pub-get@master - # Setup wdesk_sdk + # Setup repo to run on - uses: actions/checkout@v3 with: repo: ${{ matrix.repo }} path: ${{ matrix.repo }} - - uses: Workiva/gha-dart/pub-get@master - with: - package-path: ${{ matrix.repo }} + - run: dart pub get + working-directory: ${{ matrix.repo }} - run: | dart run scip_dart ./${{ matrix.repo }} || exit 1