diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 461c200..f840b11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,8 +62,5 @@ jobs: - uses: Swatinem/rust-cache@v2 - - uses: giraffate/clippy-action@v1 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - clippy_flags: --all-features - reporter: 'github-pr-review' + - name: Run clippy + run: cargo clippy --locked diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83066af..4f1c297 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,20 +89,21 @@ jobs: run: 7z a -ttar -so -an ./target/release/${{ env.RELEASE_BIN }} ${{ env.RELEASE_ADDS }} | 7z a -tgzip -si ./artifacts/${{ env.RELEASE_BIN }}-${{ needs.tag_version.outputs.version }}-${{ matrix.build }}${{ matrix.output_ending }} if: matrix.os == 'ubuntu-latest' - - name: Install p7zip on MacOS + # should not be needed anymore + #- name: Install p7zip on MacOS # 7Zip not available on MacOS, install p7zip via homebrew. - run: brew install p7zip - if: matrix.os == 'macos-latest' || matrix.os == 'macos-14' + # run: brew install p7zip + # if: matrix.os == 'macos-latest' || matrix.os == 'macos-14' - name: Create archive for MacOS run: 7z a -ttar -so -an ./target/release/${{ env.RELEASE_BIN }} ${{ env.RELEASE_ADDS }} | 7z a -tgzip -si ./artifacts/${{ env.RELEASE_BIN }}-${{ needs.tag_version.outputs.version }}-${{ matrix.build }}${{ matrix.output_ending }} if: matrix.os == 'macos-latest' || matrix.os == 'macos-14' - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: executables path: artifacts/* + name: executable-${{ matrix.build }} if-no-files-found: error @@ -112,10 +113,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: executables path: artifacts + pattern: executable-* + merge-multiple: true - name: Create draft release id: create_release diff --git a/README.md b/README.md index 76bdce8..71445d4 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,13 @@ Then either execute the binary directly or put it in your `PATH`. 1. Set up an [integration](https://docs.shopware.com/en/shopware-6-en/settings/system/integrationen?category=shopware-6-en/settings/system) inside shopware. 2. Call `sw-sync-cli auth` with the required arguments (credentials) -> [!Note] +> [!WARNING] > This will create a `.credentials.toml` file in your current working directory. > This file contains your credentials in plain text, you might want to remove it again after you are done syncing. 3. Call `sw-sync-cli sync` in either `-m import` or `-m export` mode, with a profile (`schema.yaml`) and data file `data.csv` -> [!Info] +> [!Note] > You can call `sw-sync-cli help` at any time to get more information ### Profiles (sync schema)