Skip to content

Commit

Permalink
Add test step and dry run
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanformio committed Jun 24, 2024
1 parent 52d67ec commit dcd1cfd
Showing 1 changed file with 51 additions and 39 deletions.
90 changes: 51 additions & 39 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ jobs:
run: |
git config --global user.email "[email protected]"
git config --global user.name "pkgbot"
- name: Merge target branch into current branch
run: |
git fetch origin ${{ github.event.pull_request.base.ref }}:${{ github.event.pull_request.base.ref }}
git merge ${{ github.event.pull_request.base.ref }} --no-commit --no-ff
- name: Check for merge conflicts
run: |
if ! git merge --no-commit --no-ff ${{ github.event.pull_request.base.ref }}; then
Expand All @@ -33,6 +35,7 @@ jobs:
else
echo "Merge successful."
fi
- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v3
with:
Expand All @@ -49,11 +52,17 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-
- name: Build
uses: borales/actions-yarn@v4
with:
cmd: build

- name: Test
uses: borales/actions-yarn@v4
with:
cmd: test

- name: Upload build artifact
uses: actions/upload-artifact@v3
with:
Expand All @@ -65,42 +74,45 @@ jobs:
Readme.md
package.json
# publish:
# needs: build
# if: github.event.pull_request.base.ref == 'master'
# runs-on: ubuntu-latest
# steps:
# - name: Download build artifact
# uses: actions/download-artifact@v3
# with:
# name: build-artifact
# path: ./

# - name: View downloaded build output
# run: ls -a

# - name: Add npm token to .npmrc
# run: |
# echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
# - name: Prepare version for publish
# id: prep
# run: |
# # Extract the pull request number and the short SHA of the commit
# PR_NUMBER=$(echo ${{ github.event.number }})
# COMMIT_SHORT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
# # Extract the current version from package.json
# CURRENT_VERSION=$(node -p "require('./package.json').version")
# # If the current version includes '-rc.', remove it and everything after
# # This step ensures that we start with a base version like '3.0.0' even if it was a release candidate
# BASE_VERSION=$(echo "$CURRENT_VERSION" | cut -d'-' -f1)
# # Construct the new version string
# NEW_VERSION="${BASE_VERSION}-dev.${PR_NUMBER}.${COMMIT_SHORT_SHA}"
# # Output the new version for use in subsequent GitHub Actions steps
# echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
# - name: Echo version to publish
# run: |
# echo "Version to publish: $NEW_VERSION"
# - name: Publish to npm
# run: |
# npm version $NEW_VERSION
# yarn publish --tag dev
publish:
needs: build
if: github.event.pull_request.base.ref == 'master'
runs-on: ubuntu-latest
steps:
- name: Download build artifact
uses: actions/download-artifact@v3
with:
name: build-artifact
path: ./

- name: View downloaded build output
run: ls -a

- name: Add npm token to .npmrc
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- name: Prepare version for publish
id: prep
run: |
# Extract the pull request number and the short SHA of the commit
PR_NUMBER=$(echo ${{ github.event.number }})
COMMIT_SHORT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
# Extract the current version from package.json
CURRENT_VERSION=$(node -p "require('./package.json').version")
# If the current version includes '-rc.', remove it and everything after
# This step ensures that we start with a base version like '3.0.0' even if it was a release candidate
BASE_VERSION=$(echo "$CURRENT_VERSION" | cut -d'-' -f1)
# Construct the new version string
NEW_VERSION="${BASE_VERSION}-dev.${PR_NUMBER}.${COMMIT_SHORT_SHA}"
# Output the new version for use in subsequent GitHub Actions steps
echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
- name: Echo version to publish
run: |
echo "Version to publish: $NEW_VERSION"
- name: Publish to npm
run: |
npm version $NEW_VERSION
yarn publish --dry-run --tag dev

0 comments on commit dcd1cfd

Please sign in to comment.