Skip to content

Commit

Permalink
fix git obtian tag
Browse files Browse the repository at this point in the history
  • Loading branch information
heliannuuthus committed May 10, 2024
1 parent a3b8201 commit 7c92a09
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/call-containerize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0

- name: download targets
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: targets
path: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/call-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ jobs:
tree
- name: upload gosec-report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gosec-report
path: |
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
key: ${{ runner.os }}-golang-store-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}

- name: download gosec-report
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: gosec-report
path: |
Expand Down Expand Up @@ -268,9 +268,9 @@ jobs:
run: |
go test -gcflags="all=-N -l" -coverprofile=build/coverage.out -covermode count -json -v ./... 2>&1 | tee build/test.json | gotestfmt
go-junit-report -parser gojson -in build/test.json -out build/report.xml
- name: upload target
uses: actions/upload-artifact@v3
- name: upload targets
uses: actions/upload-artifact@v4
with:
name: target
name: targets
path: |
${{ inputs.workdir }}build/
2 changes: 1 addition & 1 deletion .github/workflows/call-gradle-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: upload target
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: target
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/call-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ jobs:
GPR_USER: ${{ secrets.user }}
GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: upload target
uses: actions/upload-artifact@v3
- name: upload targets
uses: actions/upload-artifact@v4
with:
name: target
name: targets
path: |
${{ inputs.workdir }}build/
4 changes: 3 additions & 1 deletion .github/workflows/call-rust-tauri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jobs:
working-directory: ${{ inputs.workdir }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: linux install dependencies
uses: awalsh128/cache-apt-pkgs-action@latest
Expand Down Expand Up @@ -156,4 +158,4 @@ jobs:
releaseBody: ${{ github.event.head_commit.message }}
releaseDraft: true
prerelease: false
args: --target ${{ matrix.target }}
args: --target ${{ matrix.target }}
6 changes: 3 additions & 3 deletions .github/workflows/call-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ jobs:
- name: build
run: cargo install cargo-auditable && cargo auditable build --release
- name: upload target
uses: actions/upload-artifact@v3
- name: upload targets
uses: actions/upload-artifact@v4
with:
name: target
name: targets
path: |
${{ inputs.workdir }}target/release/${{ steps.environments.outputs.project }}
${{ inputs.workdir }}target/default/report.xml
Expand Down
4 changes: 2 additions & 2 deletions templates/actions.j2
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:

{% macro upload(name, paths=[]) -%}
- name: upload {{ name }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: {{ name }}
path: |
Expand All @@ -24,7 +24,7 @@ steps:

{% macro download(name, paths=[]) -%}
- name: download {{ name }}
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: {{ name }}
path: |
Expand Down
13 changes: 1 addition & 12 deletions templates/variables.j2
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,4 @@ on:
{{ name }}:
value: {{ '${{' }} {{ value }} {{ '}}' }}
description: "{{ desc }}"
{%- endmacro %}

{% macro upload_artifact(name, paths=[]) -%}
- name: upload target
uses: actions/upload-artifact@v4
with:
name: {{ name }}
path: |
{% for path in paths %}
{{ path }}
{% endfor %}
{% endmacro %}
{%- endmacro %}

0 comments on commit 7c92a09

Please sign in to comment.