Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Minor refactor; remove --tag next from publish #85

Merged
merged 2 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
run: |
npm install
- name: Publish
run: npm publish --tag next
run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 2.0.0 (2022-05-12)

- 2.0.0 major release. [#85](https://github.com/blackbaud/skyux-deploy/pull/85)

# 2.0.0-beta.2 (2022-05-12)

- Set Content-Type on uploaded files from disk. [#84](https://github.com/blackbaud/skyux-deploy/pull/84)
Expand Down
14 changes: 7 additions & 7 deletions lib/azure.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ function getContentTypeForTextFile(fileName) {
}

async function uploadAsset(containerClient, asset) {
logger.info('Creating blob for %s from file %s', asset.name, asset.file);
logger.info('Creating blob for %s', asset.name);

const blockBlobClient = containerClient.getBlockBlobClient(asset.name);

if (asset.content) {
const contentType = getContentTypeForTextFile(asset.name);
const blobContentType = getContentTypeForTextFile(asset.name);

logger.info('Setting content type to %s for blob %s', contentType, asset.name);
logger.info('Setting content type to %s for blob %s', blobContentType, asset.name);

logger.info('Uploading file %s from contents', asset.name);

Expand All @@ -39,24 +39,24 @@ async function uploadAsset(containerClient, asset) {
asset.content.length,
{
blobHTTPHeaders: {
blobContentType: contentType
blobContentType
}
}
);

logger.info('Received following response from upload(): %s', JSON.stringify(response));
} else if (asset.file) {
const contentType = mime.lookup(asset.file) || 'application/octet-stream';
const blobContentType = mime.lookup(asset.file) || 'application/octet-stream';

logger.info('Setting content type to %s for blob %s', contentType, asset.name);
logger.info('Setting content type to %s for blob %s', blobContentType, asset.name);

logger.info('Uploading file %s from disk', asset.name);

const response = await blockBlobClient.uploadFile(
asset.file,
{
blobHTTPHeaders: {
blobContentType: mime.lookup(asset.file) || 'application/octet-stream'
blobContentType
}
}
);
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blackbaud/skyux-deploy",
"version": "2.0.0-beta.2",
"version": "2.0.0",
"description": "Deployment package for skyux apps",
"main": "index.js",
"bin": {
Expand Down