Skip to content

Commit

Permalink
Merge branch 'main' into npm-buildpacks/nodejs-npm-engine
Browse files Browse the repository at this point in the history
* main:
  Bump chrono from 0.4.26 to 0.4.28 (#642)
  Bump serde from 1.0.183 to 1.0.188 (#643)
  Bump url from 2.4.0 to 2.4.1 (#644)
  Bump regex from 1.9.3 to 1.9.4 (#645)
  Skip `mirror-distribution` job if there are no versions (#628)
  Bump Swatinem/rust-cache from 2.5.1 to 2.6.2 (#640)
  Update to libcnb 0.14.0 (#638)
  Update Procfile CNB to v2.0.1 (#639)
  Bump buildpacks/github-actions from 5.3.0 to 5.4.0 (#636)
  Bump regex from 1.9.1 to 1.9.3 (#635)
  Bump serde_json from 1.0.104 to 1.0.105 (#634)
  Bump thiserror from 1.0.44 to 1.0.47 (#633)
  Bump toml from 0.7.5 to 0.7.6 (#632)
  Bump anyhow from 1.0.71 to 1.0.75 (#631)
  Bump tempfile from 3.7.0 to 3.7.1 (#630)
  Bump serde from 1.0.166 to 1.0.168 (#629)
  Ignore yarn 2.4.3 (#627)
  Fix inventory update order (#621)

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	test_support/src/lib.rs
  • Loading branch information
colincasey committed Sep 7, 2023
2 parents 8447d0c + 0502331 commit accfbfd
Show file tree
Hide file tree
Showing 16 changed files with 176 additions and 165 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/_mirror-distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: rustup update

- name: Rust Cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.2

- name: Get unmirrored versions
id: get-unmirrored-versions
Expand All @@ -43,6 +43,7 @@ jobs:
name: Mirror v${{ matrix.version }} ${{ matrix.platform && format('({0})', matrix.platform) || '' }}
needs: [get-unmirrored-versions]
runs-on: ubuntu-22.04
if: needs.get-unmirrored-versions.outputs.versions != '[]'
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_update-inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: rustup update

- name: Rust cache
uses: Swatinem/rust-cache@v2.6.0
uses: Swatinem/rust-cache@v2.6.2

- name: Set Diff Message
id: set-diff-msg
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Update Rust toolchain
run: rustup update
- name: Rust Cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.2
- name: Clippy
run: cargo clippy --all-targets --locked -- --deny warnings
- name: rustfmt
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Update Rust toolchain
run: rustup update
- name: Rust Cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.2
- name: Run unit tests
run: cargo test --locked

Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
- name: Install Rust linux-musl target
run: rustup target add x86_64-unknown-linux-musl
- name: Rust Cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.2
- name: Install Pack CLI
uses: buildpacks/github-actions/setup-pack@v5.3.0
uses: buildpacks/github-actions/setup-pack@v5.4.0
- name: Run integration tests
working-directory: ${{ matrix.buildpack-directory }}
run: cargo test --locked -- --ignored --test-threads 16
Expand Down Expand Up @@ -132,12 +132,12 @@ jobs:
- name: Install Rust linux-musl target
run: rustup target add x86_64-unknown-linux-musl
- name: Rust Cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.2
- name: Install libcnb
run: cargo install libcnb-cargo
- name: Install Pack CLI
uses: buildpacks/github-actions/setup-pack@v5.3.0
uses: buildpacks/github-actions/setup-pack@v5.4.0
- name: Install yj
uses: buildpacks/github-actions/setup-tools@v5.3.0
uses: buildpacks/github-actions/setup-tools@v5.4.0
- name: Run rspec tests against a given directory
run: bundle exec rspec ${{ matrix.test-dir }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ node_modules/
package-lock.json
.tool-versions

packaged/
**/target/

.DS_Store
Loading

0 comments on commit accfbfd

Please sign in to comment.