From 33cb81449c30316ba56553f629aabf543d633988 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 13:21:47 +0000 Subject: [PATCH 1/8] ci: publish: try to fix perm errors --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a1f43af65..44bfae4f5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,8 +6,8 @@ on: release: types: [published] -permissions: - contents: write +#permissions: +# contents: write jobs: pypi-publish: From f99824d996b4af76b5eb0e74985059626e590063 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 13:22:11 +0000 Subject: [PATCH 2/8] v6.0.0a4 --- capa/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capa/version.py b/capa/version.py index aaf31aec3..43dd4270b 100644 --- a/capa/version.py +++ b/capa/version.py @@ -5,7 +5,7 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and limitations under the License. -__version__ = "6.0.0a3" +__version__ = "6.0.0a4" def get_major_version(): From e3c8cb74df7b5178564320e8fb043c92fffa0421 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 13:33:01 +0000 Subject: [PATCH 3/8] ci: publish: dev release --- .github/workflows/publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 44bfae4f5..b8b71a926 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,6 +3,9 @@ name: publish to pypi on: + push: + branches: + - 'williballenthin-patch-1' release: types: [published] From 25624a1b46ad9e5ed9d45870fc073f3ee8388d5c Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 13:38:05 +0000 Subject: [PATCH 4/8] ci: publish: dev release --- .github/workflows/publish.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b8b71a926..bd0fe500e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,14 +36,14 @@ jobs: uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 with: path: dist/* - - name: upload package to GitHub release - uses: svenstaro/upload-release-action@2728235f7dc9ff598bd86ce3c274b74f802d2208 # v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN}} - file: dist/* - tag: ${{ github.ref }} - overwrite: true - file_glob: true + #- name: upload package to GitHub release + # uses: svenstaro/upload-release-action@2728235f7dc9ff598bd86ce3c274b74f802d2208 # v2 + # with: + # repo_token: ${{ secrets.GITHUB_TOKEN}} + # file: dist/* + # tag: ${{ github.ref }} + # overwrite: true + # file_glob: true - name: publish package uses: pypa/gh-action-pypi-publish@f5622bde02b04381239da3573277701ceca8f6a0 # release/v1 with: From b73e1e3d7f46f04a099f235889953340ba8b6001 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 13:56:04 +0000 Subject: [PATCH 5/8] pyproject: set readme context type --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1e73090f3..a28e244cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,6 +18,7 @@ authors = [ {name = "Mike Hunhoff", email = "michael.hunhoff@mandiant.com"}, ] description = "The FLARE team's open-source tool to identify capabilities in executable files." +readme = {file = "README.md", content-type = "text/markdown"} license = {file = "LICENSE.txt"} requires-python = ">=3.8" keywords = ["malware analysis", "reverse engineering", "capability detection", "software behaviors", "capa", "FLARE"] @@ -50,11 +51,10 @@ dependencies = [ "pydantic==1.10.9", "protobuf==4.23.4", ] -dynamic = ["version", "readme"] +dynamic = ["version"] [tool.setuptools.dynamic] version = {attr = "capa.version.__version__"} -readme = {file = "README.md"} [tool.setuptools] packages = ["capa"] From 3899662cbdbacb690293b78b63af63e09b8b3678 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 14:00:09 +0000 Subject: [PATCH 6/8] v6.0.0 --- CHANGELOG.md | 4 ++-- capa/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8345b279..2f58683bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,8 +95,8 @@ For those that use capa as a library, we've introduced some limited breaking cha ### Raw diffs -- [capa v5.1.0...v6.0.0](https://github.com/mandiant/capa/compare/v5.1.0...v6.0.0a1) -- [capa-rules v5.1.0...v6.0.0](https://github.com/mandiant/capa-rules/compare/v5.1.0...v6.0.0a1) +- [capa v5.1.0...v6.0.0](https://github.com/mandiant/capa/compare/v5.1.0...v6.0.0) +- [capa-rules v5.1.0...v6.0.0](https://github.com/mandiant/capa-rules/compare/v5.1.0...v6.0.0) ## v5.1.0 capa version 5.1.0 adds a Protocol Buffers (protobuf) format for result documents. Additionally, the [Vector35](https://vector35.com/) team contributed a new feature extractor using Binary Ninja. Other new features are a new CLI flag to override the detected operating system, functionality to read and render existing result documents, and a output color format that's easier to read. diff --git a/capa/version.py b/capa/version.py index 43dd4270b..f2f931fce 100644 --- a/capa/version.py +++ b/capa/version.py @@ -5,7 +5,7 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and limitations under the License. -__version__ = "6.0.0a4" +__version__ = "6.0.0" def get_major_version(): From 91b65d1d7f93bac7380cb4cdc50b4ed5eaa427f6 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 14:01:58 +0000 Subject: [PATCH 7/8] ci: publish: remove old commented code --- .github/workflows/publish.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bd0fe500e..07f310670 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,8 +9,8 @@ on: release: types: [published] -#permissions: -# contents: write +permissions: + contents: write jobs: pypi-publish: @@ -36,14 +36,6 @@ jobs: uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 with: path: dist/* - #- name: upload package to GitHub release - # uses: svenstaro/upload-release-action@2728235f7dc9ff598bd86ce3c274b74f802d2208 # v2 - # with: - # repo_token: ${{ secrets.GITHUB_TOKEN}} - # file: dist/* - # tag: ${{ github.ref }} - # overwrite: true - # file_glob: true - name: publish package uses: pypa/gh-action-pypi-publish@f5622bde02b04381239da3573277701ceca8f6a0 # release/v1 with: From 70a1e660205ac940f42a76bb371b3ec799a721ce Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 18 Jul 2023 14:02:35 +0000 Subject: [PATCH 8/8] ci: publish: remove dev code --- .github/workflows/publish.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 07f310670..4188cf090 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,9 +3,6 @@ name: publish to pypi on: - push: - branches: - - 'williballenthin-patch-1' release: types: [published]