Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tdewolff/minify
Browse files Browse the repository at this point in the history
  • Loading branch information
tdewolff committed Jan 1, 2024
2 parents 6c54826 + 079ff36 commit a3d1810
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
dry-run: false
language: go
- name: Upload Crash
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure() && steps.build.outcome == 'success'
with:
name: artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
cd bindings/js
npm test
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}.node
path: bindings/js/prebuilds/*/*.node
Expand All @@ -100,7 +100,7 @@ jobs:
- name: Install node-gyp and prebuildify
run: npm install --location=global node-gyp node-gyp-build node-api-headers prebuildify

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: bindings/js/prebuilds

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
CIBW_BEFORE_ALL: .ci/ensure-go.sh; cd bindings/py; go get github.com/tdewolff/minify/v2@${{ github.ref_name }}; go build -buildmode=c-shared -o src/minify/_minify.so

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels-linux-${{ matrix.go_target }}
path: ./wheelhouse/*.whl
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
CC=${{ matrix.xcompiler }} CGO_ENABLED=1 GOOS=windows GOARCH=${{ matrix.go_target }} go build -buildmode=c-shared -o _minify.so
- name: Upload go library
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: minify-windows-${{ matrix.go_target }}.so
path: bindings/py/_minify.so
Expand All @@ -100,7 +100,7 @@ jobs:
run: |
cd bindings/py
go get github.com/tdewolff/minify/v2@${{ github.ref_name }}
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: minify-windows-${{ matrix.go_target }}.so
path: bindings/py/src/minify
Expand All @@ -114,7 +114,7 @@ jobs:
CIBW_BUILD_VERBOSITY: 1

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels-windows-${{ matrix.go_target }}
path: ./wheelhouse/*.whl
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
go build -buildmode=c-shared -o minify.so
- name: Upload go library
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: minify-darwin-${{ matrix.go_target }}.so
path: bindings/py/minify.so
Expand All @@ -176,7 +176,7 @@ jobs:
run: |
cd bindings/py
go get github.com/tdewolff/minify/v2@${{ github.ref_name }}
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: minify-darwin-${{ matrix.go_target }}.so
path: bindings/py/src/minify/_minify.so
Expand All @@ -197,7 +197,7 @@ jobs:
#CIBW_BEFORE_ALL: cd bindings/py; go build -buildmode=c-shared -o src/minify/_minify.so

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels-macos-${{ matrix.go_target }}
path: ./wheelhouse/*.whl
Expand All @@ -224,7 +224,7 @@ jobs:
cd bindings/py
python -m build --sdist
- name: Upload sdist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
path: bindings/py/dist/*
Expand All @@ -237,7 +237,7 @@ jobs:
needs: [linux, windows, sdist]
steps:
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: bindings/py/artifacts
- name: Bundle release artifacts
Expand Down

0 comments on commit a3d1810

Please sign in to comment.