Skip to content

Commit

Permalink
Removed unnecessary flags from the CD.
Browse files Browse the repository at this point in the history
  • Loading branch information
@barshaul
barshaul committed Feb 18, 2024
1 parent 365c4ea commit a08f2ce
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 22 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/npm-cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ jobs:
RUNNER: ubuntu-latest,
ARCH: x64,
TARGET: x86_64-unknown-linux-gnu,
NPM_PUBLISH: true,
}
- {
OS: ubuntu-latest,
NAMED_OS: linux,
RUNNER: [self-hosted, Linux, ARM64],
ARCH: arm64,
TARGET: aarch64-unknown-linux-gnu,
NPM_PUBLISH: true,
CONTAINER: "2_28",
}
- {
Expand All @@ -41,15 +39,13 @@ jobs:
RUNNER: macos-latest,
ARCH: x64,
TARGET: x86_64-apple-darwin,
NPM_PUBLISH: true,
}
- {
OS: macos-latest,
NAMED_OS: darwin,
RUNNER: macos-13-xlarge,
arch: arm64,
TARGET: aarch64-apple-darwin,
NPM_PUBLISH: true,
}
steps:
- name: Checkout
Expand All @@ -64,7 +60,6 @@ jobs:
echo "RELEASE_VERSION=${version}" >> $GITHUB_ENV
- name: Setup node
if: matrix.build.NPM_PUBLISH == true
uses: actions/setup-node@v3
with:
node-version: "16"
Expand All @@ -81,7 +76,6 @@ jobs:
named_os: ${{ matrix.build.NAMED_OS }}

- name: Build Node wrapper
if: matrix.build.NPM_PUBLISH == true
uses: ./.github/workflows/build-node-wrapper
with:
os: ${{ matrix.build.OS }}
Expand All @@ -93,7 +87,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to NPM
if: matrix.build.NPM_PUBLISH == true && github.event_name != 'pull_request'
if: github.event_name != 'pull_request'
shell: bash
working-directory: ./node
run: |
Expand All @@ -112,7 +106,6 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

- name: Pack the Node package
if: matrix.build.NPM_PUBLISH == true
shell: bash
working-directory: ./node
run: |
Expand All @@ -126,7 +119,6 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

- name: Upload the Node package
if: matrix.build.NPM_PUBLISH == true
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.build.TARGET }}
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/pypi-cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ jobs:
RUNNER: ubuntu-latest,
ARCH: x64,
TARGET: x86_64-unknown-linux-gnu,
PYPI_PUBLISH: true,
}
- {
OS: ubuntu-latest,
NAMED_OS: linux,
RUNNER: [self-hosted, Linux, ARM64],
ARCH: arm64,
TARGET: aarch64-unknown-linux-gnu,
PYPI_PUBLISH: true,
CONTAINER: "2_28",
}
- {
Expand All @@ -41,15 +39,13 @@ jobs:
RUNNER: macos-latest,
ARCH: x64,
TARGET: x86_64-apple-darwin,
PYPI_PUBLISH: true,
}
- {
OS: macos-latest,
NAMED_OS: darwin,
RUNNER: macos-13-xlarge,
arch: arm64,
TARGET: aarch64-apple-darwin,
PYPI_PUBLISH: true,
}
steps:
- name: Checkout
Expand All @@ -64,7 +60,6 @@ jobs:
echo "RELEASE_VERSION=${version}" >> $GITHUB_ENV
- name: Set the package version for Python
if: matrix.build.PYPI_PUBLISH == true
working-directory: ./python
run: |
SED_FOR_MACOS=`if [[ "${{ matrix.build.OS }}" =~ .*"macos".* ]]; then echo "''"; fi`
Expand All @@ -73,18 +68,18 @@ jobs:
cat Cargo.toml
- name: Set up Python
if: matrix.build.PYPI_PUBLISH == true && !contains(matrix.build.RUNNER, 'self-hosted')
if: ${{ !contains(matrix.build.RUNNER, 'self-hosted') }}
uses: actions/setup-python@v4
with:
python-version: "3.10"

- name: Set up Python older versions for MacOS
if: matrix.build.PYPI_PUBLISH == true && startsWith(matrix.build.NAMED_OS, 'darwin')
if: startsWith(matrix.build.NAMED_OS, 'darwin')
run: |
brew install [email protected] [email protected]
- name: Setup Python for self-hosted Ubuntu runners
if: matrix.build.PYPI_PUBLISH == true && contains(matrix.build.OS, 'ubuntu') && contains(matrix.build.RUNNER, 'self-hosted')
if: contains(matrix.build.OS, 'ubuntu') && contains(matrix.build.RUNNER, 'self-hosted')
run: |
sudo apt update -y
sudo apt upgrade -y
Expand All @@ -97,7 +92,6 @@ jobs:
named_os: ${{ matrix.build.NAMED_OS }}

- name: Build Python wrapper
if: matrix.build.PYPI_PUBLISH == true
uses: ./.github/workflows/build-python-wrapper
with:
os: ${{ matrix.build.OS }}
Expand All @@ -107,15 +101,14 @@ jobs:

- name: Include protobuf files in the package
working-directory: ./python
if: matrix.build.PYPI_PUBLISH == true
run: |
SED_FOR_MACOS=`if [[ "${{ matrix.build.OS }}" =~ .*"macos".* ]]; then echo "''"; fi`
sed -i $SED_FOR_MACOS '/pb2.py/d' .gitignore
# Log the edited .gitignore file
cat .gitignore
- name: Build Python wheels (linux)
if: matrix.build.PYPI_PUBLISH == true && startsWith(matrix.build.NAMED_OS, 'linux') && github.event_name != 'pull_request'
if: startsWith(matrix.build.NAMED_OS, 'linux') && github.event_name != 'pull_request'
uses: PyO3/maturin-action@v1
with:
working-directory: ./python
Expand All @@ -136,15 +129,15 @@ jobs:
fi
- name: Build Python wheels (macos)
if: matrix.build.PYPI_PUBLISH == true && startsWith(matrix.build.NAMED_OS, 'darwin') && github.event_name != 'pull_request'
if: startsWith(matrix.build.NAMED_OS, 'darwin') && github.event_name != 'pull_request'
uses: PyO3/maturin-action@v1
with:
working-directory: ./python
target: ${{ matrix.build.TARGET }}
args: --release --strip --out wheels -i python3.8 python3.9 python3.10 python3.11 python3.12

- name: Upload Python wheels
if: matrix.build.PYPI_PUBLISH == true && github.event_name != 'pull_request'
if: github.event_name != 'pull_request'
uses: actions/upload-artifact@v3
with:
name: wheels
Expand Down

0 comments on commit a08f2ce

Please sign in to comment.