diff --git a/.github/workflows/develop-merge.yml b/.github/workflows/develop-merge.yml deleted file mode 100644 index 004e73082d..0000000000 --- a/.github/workflows/develop-merge.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Create develop Pull Request - -on: - pull_request: - types: [closed] - branches: - - master - -jobs: - create_develop_pr: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Create new Pull Request - uses: peter-evans/create-pull-request@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - base: develop - branch: ${{github.event.pull_request.head.ref}} - commit-message: "Update develop branch with changes from ${{github.event.pull_request.head.ref}}" - title: "Update develop branch with changes from ${{github.event.pull_request.head.ref}}" - body: | - This pull request updates the develop branch with changes from the ${{github.event.pull_request.head.ref}} branch. - - diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 37c383e3ee..0000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Release - -permissions: - contents: write - -on: - push: - tags: - - '*' - -jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - uses: actions/setup-node@v3 - with: - node-version: 16.x - - - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/Dockerfile b/Dockerfile index 75ab8dd27d..e13b9138ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # It requires specifying an Infura API key to pull data. # See README for futher information -FROM node:14 AS base +FROM node:16 AS base ENV APP_ROOT /app RUN mkdir ${APP_ROOT} @@ -13,13 +13,13 @@ FROM base AS dependencies COPY prepare.js ./ COPY package*.json ./ -RUN npm install -g npm@7 +RUN npm install -g npm@8 RUN npm ci FROM dependencies AS build COPY . . -RUN npm run build -- --mode docker +RUN npm run build:docker -- --mode docker FROM nginx:1.23.3-alpine as release @@ -27,4 +27,4 @@ COPY --from=build /app/dist /usr/share/nginx/html COPY --from=build /app/scripts/docker-init.sh / EXPOSE 80 -CMD ["/docker-init.sh"] \ No newline at end of file +CMD ["/docker-init.sh"] diff --git a/Dockerfile.dev b/Dockerfile.dev index 5b0992ef11..dfaab94f80 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,6 +1,6 @@ -FROM node:14-alpine +FROM node:16-alpine -RUN npm install -g npm@7 +RUN npm install -g npm@8 RUN mkdir -p /app WORKDIR /app diff --git a/package-lock.json b/package-lock.json index c4deeff444..673958bc30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer-labs/frontend-v2", - "version": "1.90.5", + "version": "1.90.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer-labs/frontend-v2", - "version": "1.90.5", + "version": "1.90.6", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 31300a6868..551c737a0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer-labs/frontend-v2", - "version": "1.90.5", + "version": "1.90.6", "engines": { "node": "=16", "npm": ">=8" @@ -10,6 +10,7 @@ "dev": "npm run generate:tokenlists && vite", "serve": "npm run dev", "build": "npm run generate:tokenlists && vite build", + "build:docker": "export NODE_OPTIONS=--max-old-space-size=8192 && npm run build", "build:withouttokenlists": "vite build", "build:watch": "vite build --watch", "preview": "vite preview",