diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index dfff8649..8bf7a0b6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,4 +11,3 @@ ---- diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 11c414bd..9e6630fc 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -16,7 +16,7 @@ jobs: matrix: sdk: [ 2.19.6, stable ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: dart-lang/setup-dart@v1 with: sdk: ${{ matrix.sdk }} @@ -33,3 +33,9 @@ jobs: run: make gen-fixtures --check - name: Run tests run: make test-with-serve-remotes + # TODO https://github.com/Workiva/json_schema/issues/184 + # When ^^^ is addressed, remove the --skip-validation flag here + - name: Publish - dry run + if: ${{ matrix.sdk == 'stable' }} + run: dart pub publish --dry-run --skip-validation + diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 4b94d7ac..ab448ff4 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -16,11 +16,25 @@ jobs: name: Create SBOM Release Asset runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 - name: Publish SBOM to Release Assets uses: anchore/sbom-action@v0 with: path: ./ format: cyclonedx-json + # TODO https://github.com/Workiva/json_schema/issues/184 + # Based on https://github.com/dart-lang/setup-dart/blob/main/.github/workflows/publish.yml publish: name: Publish to pub.dev - uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dart-lang/setup-dart@v1 + with: + sdk: stable + - name: Install dependencies + run: dart pub get + - name: Publish - dry run + run: dart pub publish --dry-run --skip-validation + - name: Publish + run: dart pub publish -f diff --git a/.pubignore b/.pubignore index 7626a32d..4ed3c305 100644 --- a/.pubignore +++ b/.pubignore @@ -1,5 +1,4 @@ test tool Makefile -Dockerfile dart_test.yaml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 52ad0e60..00000000 --- a/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -#################### -## Dart Stage ## -#################### -FROM drydock-prod.workiva.net/workiva/dart2_base_image:1 as build - - -# setup ssh -ARG GIT_SSH_KEY -ARG KNOWN_HOSTS_CONTENT - -# Setting up ssh and ssh-agent for git-based dependencies -RUN mkdir /root/.ssh/ && \ - echo "$KNOWN_HOSTS_CONTENT" > "/root/.ssh/known_hosts" && \ - chmod 700 /root/.ssh/ && \ - umask 0077 && echo "$GIT_SSH_KEY" >/root/.ssh/id_rsa && \ - eval "$(ssh-agent -s)" && \ - ssh-add /root/.ssh/id_rsa - -WORKDIR /build/ - -COPY . /build/ - - -RUN timeout 5m dart pub get - -FROM scratch \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 714a5536..fc42bd1e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: JSON Schema implementation in Dart homepage: https://github.com/workiva/json_schema environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' dependencies: collection: ^1.15.0