diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build.yml similarity index 74% rename from .github/workflows/build-binaries.yml rename to .github/workflows/build.yml index a0e42d45..706cc09a 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build Binaries +name: Build on: pull_request @@ -17,7 +17,8 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - run: npm ci --production --build-from-source + - name: Build package + run: npm ci --production --build-from-source build-ubuntu: @@ -33,7 +34,8 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - run: npm ci --production --build-from-source + - name: Build package + run: npm ci --production --build-from-source build-macos: @@ -49,4 +51,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - run: npm ci --production --build-from-source + - name: Install dependencies + run: brew install unixodbc + - name: Build package + run: npm ci --production --build-from-source diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index f89bb396..1a15cb0f 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -21,9 +21,12 @@ jobs: node-version: ${{ matrix.node-version }} - name: Upgrade NPM run: npm install -g npm - - run: npm install -g node-gyp - - run: npm ci --production - - run: ./node_modules/.bin/node-pre-gyp rebuild --production + - name: Install node-gyp + run: npm install -g node-gyp + - name: Install npm dependencies + run: npm ci --production + - name: Build Binary + run: ./node_modules/.bin/node-pre-gyp rebuild --production - name: Package Binary run: ./node_modules/.bin/node-pre-gyp package - name: Upload Artifact @@ -46,11 +49,16 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + - name: Install Dependencies + run: brew install unixodbc - name: Upgrade NPM run: npm install -g npm - - run: npm install -g node-gyp - - run: npm ci --production - - run: ./node_modules/.bin/node-pre-gyp rebuild --production + - name: Install node-gyp + run: npm install -g node-gyp + - name: Install npm dependencies + run: npm ci --production + - name: Build Binary + run: ./node_modules/.bin/node-pre-gyp rebuild --production - name: Package Binary run: ./node_modules/.bin/node-pre-gyp package - name: Upload Artifact @@ -75,9 +83,12 @@ jobs: node-version: ${{ matrix.node-version }} - name: Upgrade NPM run: npm install -g npm - - run: npm install -g node-gyp - - run: npm ci --production - - run: ./node_modules/.bin/node-pre-gyp rebuild --production + - name: Install node-gyp + run: npm install -g node-gyp + - name: Install npm dependencies + run: npm ci --production + - name: Build Binary + run: ./node_modules/.bin/node-pre-gyp rebuild --production - name: Package Binary run: ./node_modules/.bin/node-pre-gyp package - name: Upload Artifact diff --git a/.gitignore b/.gitignore index 40873024..d0177b16 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,5 @@ deps core* *.env .vscode -build* +build*/ lib/bindings