From 3d0bd51b0f86e6697d47d2503925c45cc07c10e1 Mon Sep 17 00:00:00 2001 From: Spark <79936503+spa5k@users.noreply.github.com> Date: Sat, 8 Jun 2024 11:35:49 +0530 Subject: [PATCH] fix: ci --- .github/workflows/release.yml | 21 ++++++++++++++------- Cargo.toml | 1 + Dockerfile | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66bdbce..c1b4539 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,12 +2,16 @@ env: NAME: uids_postgres EXT_NAME: uids_postgres PKG_NAME: uids_postgres + name: Release + on: push: tags: [v*] + concurrency: group: ${{ github.workflow }}-${{ github.ref }} + jobs: create-release: name: Create release @@ -19,14 +23,14 @@ jobs: id: create-release uses: actions/create-release@v1 env: - GITHUB_TOKEN: ${{ github.token }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} + build-linux-gnu: name: Build & Release for linux - needs: - - create-release + needs: create-release strategy: fail-fast: false matrix: @@ -39,8 +43,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Install rust uses: dtolnay/rust-toolchain@1.78.0 + - name: Install dependencies run: | # Add postgres package repo @@ -58,12 +64,12 @@ jobs: # Ensure installed pg_config is first on path export PATH=$PATH:/usr/lib/postgresql/${{ matrix.postgres }}/bin - cargo install cargo-pgrx --version 0.11.2 --locked + cargo install cargo-pgrx --version 0.11.4 --locked cargo pgrx init --pg${{ matrix.postgres }}=/usr/lib/postgresql/${{ matrix.postgres }}/bin/pg_config + - name: Build artifacts run: | # selects the pgVer from pg_config on path - # https://github.com/tcdi/pgrx/issues/288 cargo pgrx package --no-default-features --features pg${{ matrix.postgres }} # Create installable package @@ -107,12 +113,13 @@ jobs: sudo chown -R root:root package sudo chmod -R 00755 package sudo dpkg-deb -Zxz --build --root-owner-group package + - name: Upload artifacts uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ github.token }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} asset_path: ./package.deb asset_name: ${{ env.NAME }}-${{ github.ref_name }}-pg${{ matrix.postgres }}-${{ matrix.box.arch }}-linux-gnu.deb - asset_content_type: application/vnd.debian.binary-package \ No newline at end of file + asset_content_type: application/vnd.debian.binary-package diff --git a/Cargo.toml b/Cargo.toml index e4b7f82..51a1503 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "uids" version = "0.0.0" edition = "2021" +publish = false [lib] crate-type = ["cdylib"] diff --git a/Dockerfile b/Dockerfile index b4b92de..147f207 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN \ cargo --version # pgrx -RUN cargo install cargo-pgrx --version 0.11.2 --locked +RUN cargo install cargo-pgrx --version 0.11.4 --locked RUN cargo pgrx init --pg${PG_MAJOR} $(which pg_config)