Skip to content

Commit

Permalink
Pin Conan version to 1.x + Update NPM publish (#393)
Browse files Browse the repository at this point in the history
* pin conan version to 1.x

* pin to less then 2

* pin macos version to hopefully find binaries

* run npm config fix to get around outdate conf

* attempt 2 fix reg scope

* part 2

* add username and email for scoped reg

* fixup passing creds for npm
  • Loading branch information
Chris Mc authored Aug 22, 2023
1 parent 4c0b441 commit 73f3da7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-conan/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: "Install and configure the conan client for use in the user-managem
runs:
using: "composite"
steps:
- run: python3 -m pip install conan --upgrade
- run: python3 -m pip install "conan<2" --upgrade
shell: bash
- run: conan config init --force
shell: bash
Expand Down
10 changes: 6 additions & 4 deletions .github/actions/setup-rtfact-npm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ runs:
steps:
- shell: bash
run: |
echo '_auth = ${{ inputs.auth_token }}' > ~/.npmrc
echo 'always-auth = true' >> ~/.npmrc
echo 'email = ${{ inputs.email }}' >> ~/.npmrc
echo 'registry = ${{ inputs.registry }}' >> ~/.npmrc
REG_SCOPE=$( echo "${{ inputs.registry }}" | awk -F'^http[s]?:' '{print $2}')
echo 'registry=${{ inputs.registry }}' > ~/.npmrc
echo "$REG_SCOPE:_password=${{ inputs.auth_token }}" >> ~/.npmrc
echo "$REG_SCOPE:username=${{ inputs.email }}" >> ~/.npmrc
echo "$REG_SCOPE:email=${{ inputs.email }}" >> ~/.npmrc
echo "$REG_SCOPE:always-auth=true" >> ~/.npmrc
2 changes: 1 addition & 1 deletion .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
fail_ci_if_error: true

macos:
runs-on: macos-latest
runs-on: macos-11
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ jobs:
if: needs.check.outputs.permitted == 'true'
run: |
npm pack
npm publish $NAME-frontend-$BUILD_VERSION.tgz
npm publish --registry ${{ env.NPM_REGISTRY_URL }} $NAME-frontend-$BUILD_VERSION.tgz
frontend-image:
needs: [setup, frontend, check]
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ FROM alpine:3.16
RUN apk update && apk add --no-cache \
gcc g++ build-base linux-headers \
cmake bash libstdc++ perl tar git \
py-pip && pip install conan
py-pip && pip install "conan<2"
2 changes: 1 addition & 1 deletion backend/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ In order to get started you will need to satisfy the following requirements:

- C++14 capable build environment
- CMake v3.19 (recommend v3.23 to take advantage of presets when working locally)
- Conan v1.51
- Conan v1.51 (but less then 2) `pip install "conan<2"`

### Conan Configuration

Expand Down

0 comments on commit 73f3da7

Please sign in to comment.