From 9056f71c05ef7b960b54c1901871fff670f32811 Mon Sep 17 00:00:00 2001 From: harmless-tech <28830529+harmless-tech@users.noreply.github.com> Date: Sat, 26 Aug 2023 14:25:23 -0400 Subject: [PATCH] Fix actions --- .gitattributes | 7 ++++ .github/workflows/build.yml | 17 ---------- .github/workflows/release.yml | 63 +++++++++++++---------------------- Cargo.toml | 2 +- README.md | 4 ++- 5 files changed, 35 insertions(+), 58 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e9d56b1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +* text=auto + +# Because scripts +scripts/*.sh text eol=lf + +# Because of caching in GitHub Actions +Cargo.lock text eol=lf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8e3964..3651ed8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -162,12 +162,6 @@ jobs: run: cross test --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }} - name: Build run: cross build --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }} - - name: Run cargo-prebuilt - if: ${{ contains(matrix.target, 'x86_64-unknown-linux-') }} - run: | - target/${{ matrix.target }}/debug/${{ env.bin-name }} just - just --version - target/${{ matrix.target }}/debug/${{ env.bin-name }} --color just - name: Artifact uses: actions/upload-artifact@v3 with: @@ -217,12 +211,6 @@ jobs: run: cargo test --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }} - name: Build run: cargo auditable build --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }} - - name: Run cargo-prebuilt - if: ${{ matrix.can-test }} - run: | - target/${{ matrix.target }}/debug/${{ env.bin-name }} just - just --version - target/${{ matrix.target }}/debug/${{ env.bin-name }} --color just - name: Artifact uses: actions/upload-artifact@v3 with: @@ -272,11 +260,6 @@ jobs: run: cargo test --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }} - name: Build run: cargo auditable build --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }} - - name: Run cargo-prebuilt - if: ${{ matrix.can-test }} - run: | - target/${{ matrix.target }}/debug/${{ env.bin-name }}.exe just - just --version - name: Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d35e8d1..fe00f9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,30 +70,30 @@ jobs: popd fi done - - name: Sign archives - shell: bash - run: | - eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" - brew install minisign - echo -n "$SIGNING_KEY" | base64 --decode > ~/.minisign_secret.key - for D in target-*; do - if [ -d "${D}" ]; then - echo "${D}" - pushd "${D}" - - for file in ./*.tar.gz ./*.zip; do - if [ -f "$file" ]; then - minisign -S -s ~/.minisign_secret.key -m $file - minisign -V -p ../keys/cargo-prebuilt.pub -m $file - fi - done - - popd - fi - done - rm -f ~/.minisign_secret.key - env: - SIGNING_KEY: ${{ secrets.MINISIGN_SIGNING_KEY }} +# - name: Sign archives +# shell: bash +# run: | +# eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +# brew install minisign +# echo -n "$SIGNING_KEY" | base64 --decode > ~/.minisign_secret.key +# for D in target-*; do +# if [ -d "${D}" ]; then +# echo "${D}" +# pushd "${D}" +# +# for file in ./*.tar.gz ./*.zip; do +# if [ -f "$file" ]; then +# minisign -S -s ~/.minisign_secret.key -m $file +# minisign -V -p ../keys/dvs.pub -m $file +# fi +# done +# +# popd +# fi +# done +# rm -f ~/.minisign_secret.key +# env: +# SIGNING_KEY: ${{ secrets.MINISIGN_SIGNING_KEY }} - name: Create and push artifacts to release uses: ncipollo/release-action@v1 with: @@ -441,11 +441,6 @@ jobs: run: cross test --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }} - name: Build run: cross build --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }} - - name: Run cargo-prebuilt - if: ${{ contains(matrix.target, 'x86_64-unknown-linux-') }} - run: | - target/${{ matrix.target }}/release/${{ env.bin-name }} just - just --version - name: Tar run: tar czvf ${{ matrix.target }}.tar.gz -C ./target/${{ matrix.target }}/release ${{ env.bin-name }}${{ matrix.ending }} - name: Hash @@ -495,11 +490,6 @@ jobs: run: cargo test --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }} - name: Build run: cargo auditable build --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }} - - name: Run cargo-prebuilt - if: ${{ matrix.can-test }} - run: | - target/${{ matrix.target }}/release/${{ env.bin-name }} just - just --version - name: Tar run: tar czvf ${{ matrix.target }}.tar.gz -C ./target/${{ matrix.target }}/release ${{ env.bin-name }} - name: Hash @@ -549,11 +539,6 @@ jobs: run: cargo test --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }} - name: Build run: cargo auditable build --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }} - - name: Run cargo-prebuilt - if: ${{ matrix.can-test }} - run: | - target/${{ matrix.target }}/release/${{ env.bin-name }}.exe just - just --version - name: Zip uses: vimtor/action-zip@v1.1 with: diff --git a/Cargo.toml b/Cargo.toml index f5aa16e..03861eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "dvs" version = "0.1.0-dev" edition = "2021" authors = ["harmless-tech"] -description = "Create and manage docker systems" +description = "Create and manage virtual systems using docker" readme = "README.md" license = "MIT" repository = "https://github.com/harmless-tech/dvs" diff --git a/README.md b/README.md index dee85c8..26eb425 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# dvs \ No newline at end of file +# dvs + +Create and manage virtual systems using docker.