Skip to content

Commit

Permalink
- Lock DocFX to last-known working version (#407)
Browse files Browse the repository at this point in the history
- Fix inconsistencies, bad failures in Makefile steps
  • Loading branch information
nwithan8 authored Feb 23, 2023
1 parent d62bb01 commit 2709381
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ jobs:
dotnet-version: 7.x.x

- name: Install docfx
run: dotnet tool update -g docfx
run: make install-tools

- name: Generate docs
run: docfx docs/docfx.json
run: make docs

- name: Deploy docs
uses: peaceiris/actions-gh-pages@v3
Expand Down
2 changes: 1 addition & 1 deletion EasyPost.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1283,4 +1283,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions EasyPost/Services/Beta/ReferralService.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using EasyPost._base;
using EasyPost.Exceptions.API;
using EasyPost.Models.API;
using EasyPost.Models.API.Beta;
using RestSharp;
Expand All @@ -26,7 +26,7 @@ public ReferralService(EasyPostClient client)
/// <param name="paymentMethodReference">ID of the card or bank account provided by Stripe.</param>
/// <param name="priority">Which priority to save this payment method as on EasyPost.</param>
/// <returns>A <see cref="PaymentMethod"/> object.</returns>
/// <exception cref="Exception">When the request fails.</exception>
/// <exception cref="ApiError">When the request fails.</exception>
public async Task<PaymentMethod> AddPaymentMethod(string stripeCustomerId, string paymentMethodReference, PaymentMethod.Priority? priority = null)
{
priority ??= PaymentMethod.Priority.Primary;
Expand Down
2 changes: 1 addition & 1 deletion EasyPost/Services/PartnerService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public async Task<ReferralCustomer> CreateReferral(Dictionary<string, object> pa
/// <param name="cvc">CVC of the credit card.</param>
/// <param name="priority">Priority of the credit card.</param>
/// <returns>An EasyPost.PaymentMethodObject instance.</returns>
/// <exception cref="Exception">When the request fails.</exception>
/// <exception cref="ApiError">When the request fails.</exception>
[CrudOperations.Update]
public async Task<PaymentMethod> AddCreditCardToUser(string referralApiKey, string number, int expirationMonth, int expirationYear, string cvc, PaymentMethod.Priority? priority = null)
{
Expand Down
2 changes: 1 addition & 1 deletion EasyPost/_base/EasyPostObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public abstract class EasyPostObject : EphemeralEasyPostObject
/// <param name="rootElement">Root element of JSON returned by update call.</param>
/// <param name="overrideApiVersion">Override the API version used for update call.</param>
/// <typeparam name="T">Type of object to update.</typeparam>
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
/// <returns>A task representing the asynchronous operation.</returns>
protected async Task Update<T>(Method method, string url, Dictionary<string, object>? parameters = null, string? rootElement = null, ApiVersion? overrideApiVersion = null)
where T : class
{
Expand Down
2 changes: 1 addition & 1 deletion EasyPost/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,4 +238,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ coverage-check:

## docs - Generates library documentation
docs:
docfx docs/docfx.json
git add docs/*
dotnet tool run docfx docs/docfx.json
git add docs/* || exit 0

## format - Formats the project
format:
Expand All @@ -43,7 +43,7 @@ install-tools:
dotnet new tool-manifest || exit 0
dotnet tool install --local security-scan --version 5.6.3 || exit 0
dotnet tool install --local dotnet-format || exit 0
dotnet tool install --local docfx || exit 0
dotnet tool install --local docfx --version 2.60.2 || exit 0

## install - Install requirements
install: | install-tools
Expand Down

0 comments on commit 2709381

Please sign in to comment.