Skip to content

Commit

Permalink
fix: fix conflig
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-nguyen-20032023 committed Nov 20, 2023
2 parents 9b6ee74 + bd1f365 commit e495f2f
Show file tree
Hide file tree
Showing 19 changed files with 8,676 additions and 9,617 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
env:
GITHUB_USERNAME: ${{ github.actor }}
GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.KEY_NPM_RC }}
run: |
./ci/build.sh
updateManifest:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
env:
GITHUB_USERNAME: ${{ github.actor }}
GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.KEY_NPM_RC }}
run: |
./ci/build.sh
build-hasura-metadata:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,5 @@ jobs:

- name: Install dependencies
run: npm install
env:
NODE_AUTH_TOKEN: ${{ secrets.KEY_NPM_RC }}
- name: Lint check
run: npm run lint
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ jobs:
run: npm list
- name: Install dependencies
run: npm install
env:
NODE_AUTH_TOKEN: ${{ secrets.KEY_NPM_RC }}
- name: Setup env
run: cp ci/.env.ci .env
- name: Setup config.json
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@ FROM node:16-alpine
WORKDIR /app

# Install dependencies
ARG NPM_TOKEN
RUN echo "@aura-nw:registry=https://npm.pkg.github.com" >> .npmrc && echo "//npm.pkg.github.com/:_authToken=$NPM_TOKEN" >> .npmrc
COPY package.json package.json ./
RUN npm install && rm .npmrc
COPY package.json package-lock.json yarn.lock ./
RUN yarn install

# Copy source
COPY . .

# Build and cleanup
ENV NODE_ENV=production
RUN npm run build
RUN yarn build

# Start server
CMD ["npm", "run", "start"]
CMD ["yarn", "start"]
2 changes: 1 addition & 1 deletion ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ set -xe
#Login to registry
echo $GITHUB_PASSWORD | docker login ghcr.io -u $GITHUB_USERNAME --password-stdin
#Build and push image
docker build -t ${CONTAINER_RELEASE_IMAGE} --build-arg NPM_TOKEN=$NPM_TOKEN -f Dockerfile .
docker build -t ${CONTAINER_RELEASE_IMAGE} -f Dockerfile .
docker push ${CONTAINER_RELEASE_IMAGE}
6 changes: 6 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,5 +224,11 @@
"indexNamePattern": "%(tx_id|block_height)%",
"milisecondInterval": 60000
}
},
"jobCreateConstraintInAttrPartition": {
"jobRepeatCheckNeedCreateConstraint": {
"millisecondRepeatJob": 600000
},
"statementTimeout": 600000
}
}
15 changes: 15 additions & 0 deletions migrations/20231115070514_drop_not_null_in_voting_time_proposal.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Knex } from 'knex';

export async function up(knex: Knex): Promise<void> {
await knex.schema.alterTable('proposal', (table) => {
table.timestamp('voting_start_time').nullable().alter();
table.timestamp('voting_end_time').nullable().alter();
});
}

export async function down(knex: Knex): Promise<void> {
await knex.schema.alterTable('proposal', (table) => {
table.timestamp('voting_start_time').notNullable().alter();
table.timestamp('voting_end_time').notNullable().alter();
});
}
Loading

0 comments on commit e495f2f

Please sign in to comment.