Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrating from yarn to pnpm #2732

Merged
merged 33 commits into from
Dec 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4248e2c
migrating from yarn to pnpm
imolorhe Dec 8, 2024
a7f50d0
setup pnpm in github actions
imolorhe Dec 9, 2024
6db6910
replace network-timeout with config fetch-timeout
imolorhe Dec 9, 2024
37d94b8
fixed pnpm install commands in gh actions
imolorhe Dec 9, 2024
0601ff6
missing dev deps
imolorhe Dec 9, 2024
4698a6c
updated lock
imolorhe Dec 9, 2024
194242f
missing dev dep
imolorhe Dec 9, 2024
52f60ec
missing dev deps
imolorhe Dec 9, 2024
0e2c996
changed build:ci script
imolorhe Dec 9, 2024
c814543
docker ignore docs and electron packages
imolorhe Dec 9, 2024
7ce9a69
remove lerna boostrap from gh actions
imolorhe Dec 9, 2024
bdf067f
pnpm prisma
imolorhe Dec 9, 2024
f6bfdff
used consistent rxjs versions
imolorhe Dec 9, 2024
03f6353
removed nx.json
imolorhe Dec 9, 2024
85238b0
added nx as direct dependency of app
imolorhe Dec 9, 2024
45ff4a6
replace build with prepare
imolorhe Dec 9, 2024
5e006ea
replace npm scripts with pnpm
imolorhe Dec 9, 2024
5d59e09
use pmpm dlx to call prisma
imolorhe Dec 9, 2024
8fb2a5e
switched gh action for electron building
imolorhe Dec 9, 2024
a57bcc9
specified package manager
imolorhe Dec 9, 2024
2f5a26c
allow chocolatey pack to fail
imolorhe Dec 10, 2024
c37abe5
ignore scripts on install
imolorhe Dec 10, 2024
b3ce3a0
prisma generate on build
imolorhe Dec 10, 2024
56a46f7
remove ignore-scripts
imolorhe Dec 10, 2024
517d731
replacing lerna usage
imolorhe Dec 14, 2024
ad4bb29
use pnpm to bump version
imolorhe Dec 14, 2024
46e6937
added option disabling git tag when bumping version
imolorhe Dec 14, 2024
8e84c78
remove lerna dependency
imolorhe Dec 14, 2024
65ddaca
move prepare scripts to bootstrap
imolorhe Dec 14, 2024
bf67ed1
updated buikd:ci script
imolorhe Dec 14, 2024
582d70e
added dependsOn to bootstrap task
imolorhe Dec 14, 2024
701dfe0
removed ARGS for pnpm version
imolorhe Dec 14, 2024
aee26b8
cleanup
imolorhe Dec 14, 2024
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
Prev Previous commit
Next Next commit
switched gh action for electron building
  • Loading branch information
imolorhe committed Dec 9, 2024
commit 8fb2a5e3aff3cc1dc33371df9c04cc225ba4ba1e
6 changes: 2 additions & 4 deletions .github/workflows/_publish-electron.yml
Original file line number Diff line number Diff line change
@@ -71,8 +71,6 @@ jobs:
with:
xcode-version: latest-stable
- run: pnpm i --frozen-lockfile
- name: Enable Corepack before setting up Node (temporary workaround for action-electron-builder which uses yarn and causes errors as it conflicts with pnpm https://github.com/yarnpkg/yarn/issues/9015)
run: corepack enable
- uses: nick-invision/retry@v2
with:
timeout_minutes: 20
@@ -94,12 +92,12 @@ jobs:
# disable for macos not in master branch, because code signing is skipped in pull requests
if: ${{ inputs.publish || !(startsWith(matrix.os, 'macos') && github.ref != 'refs/heads/master') }}
id: build-electron
uses: CryogenicPlanet/action-electron-builder@v2 # Using CryogenicPlanet until the main action adds skip_install
uses: paneron/action-electron-builder@v1.8.1
with:
github_token: ${{ secrets.github_token }}
package_root: packages/altair-electron/
skip_build: true
skip_install: true
skip_package_manager_install: true
mac_certs: ${{ secrets.mac_certs }}
mac_certs_password: ${{ secrets.mac_certs_password }}
args: ${{ inputs.publish && '--publish always' || '--publish never' }}
39 changes: 25 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -40,21 +40,29 @@ RUN --mount=type=bind,source=package.json,target=package.json \

################################################################################
# Create a stage for building the application.
FROM deps AS build

COPY . .

# Download additional development dependencies before building, as some projects require
# "devDependencies" to be installed to build. If you don't need this, remove this step.
RUN --mount=type=bind,source=package.json,target=package.json \
--mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
--mount=type=cache,target=/root/.local/share/pnpm/store \
pnpm install --frozen-lockfile
FROM base AS build
COPY . /usr/src/app
WORKDIR /usr/src/app
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
RUN pnpm run -r build
# RUN pnpm deploy --filter=app1 --prod /prod/app1
RUN pnpm deploy --filter=@altairgraphql/api /api-app
# FROM deps AS build

# Copy the rest of the source files into the image.
# COPY . .
# Run the build script.
RUN pnpm run build

# # Download additional development dependencies before building, as some projects require
# # "devDependencies" to be installed to build. If you don't need this, remove this step.
# RUN --mount=type=bind,source=package.json,target=package.json \
# --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
# --mount=type=cache,target=/root/.local/share/pnpm/store \
# pnpm install --frozen-lockfile

# # Copy the rest of the source files into the image.
# # COPY . .
# # Run the build script.
# RUN pnpm run build

################################################################################
# Create a new stage to run the application with minimal runtime dependencies
@@ -67,14 +75,17 @@ ENV NODE_ENV=production
# Run the application as a non-root user.
USER node

COPY --from=build /api-app /app
WORKDIR /app

# Copy package.json so that package manager commands can be used.
COPY package.json .
# COPY package.json .

# Copy the production dependencies from the deps stage and also
# the built application from the build stage into the image.
# COPY --from=deps /usr/src/app/node_modules ./node_modules
# COPY --from=build /usr/src/app/dist ./dist
COPY --from=build /usr/src/app/ .
# COPY --from=build /usr/src/app/ .

ENV NEW_RELIC_NO_CONFIG_FILE=true
ENV NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=true
Loading