diff --git a/.github/workflows/pack_early.yaml b/.github/workflows/pack_early.yaml index 3cfaa12..fcb2a7c 100644 --- a/.github/workflows/pack_early.yaml +++ b/.github/workflows/pack_early.yaml @@ -4,7 +4,6 @@ on: push: branches: - dev - - websocket pull_request: branches: [ main, dev ] diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3292124..0712791 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,54 +1,63 @@ -name: Publish_stable +name: Publish on: - push: - branches: - - main + push: + branches: [ main ] jobs: - lint: - runs-on: ubuntu-latest - steps: - - name: Checkout the source code - uses: actions/checkout@v3 - - name: Lint (sqflint) - uses: arma-actions/sqflint@master - continue-on-error: true - - publish: - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v4 - with: - lfs: true - - name: Setup HEMTT - uses: arma-actions/hemtt@v1 - - name: Run HEMTT build - run: hemtt release - - name: Extract Zipped Mod - run: unzip releases/armatak-latest.zip -d releases - - uses: arma-actions/workshop-upload@v1 - with: - appId: '107410' - itemId: ${{ secrets.STEAM_WORKSHOP_ITEM_ID }} - contentPath: releases/@armatak - changelog: 'Update' - env: - STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }} - STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }} - - name: Discord notification - uses: tsickert/discord-webhook@v5.3.0 - with: - webhook-url: ${{ secrets.DISCORD_WEBHOOK }} - username: ARMATAK - avatar-url: https://media.githubusercontent.com/media/${{ github.repository }}/main/picture.png - embed-title: ${{ github.repository }} Updated and Published - embed-url: 'https://github.com/${{ github.repository }}' - embed-description: Commit ${{ github.sha }} - ${{ github.event.head_commit.message }} authorized and updated on Steam Workshop! - embed-author-name: ${{ github.actor }} - embed-author-url: https://github.com/${{ github.actor }} - embed-author-icon-url: https://avatars.githubusercontent.com/${{ github.actor }} - embed-footer-icon-url: https://avatars.githubusercontent.com/${{ github.repository_owner }} - embed-footer-text: ${{ github.repository_owner }} - embed-color: 4849919 \ No newline at end of file + build_extension: + strategy: + matrix: + arrays: [ + os: { tag: "windows-latest", target: "i686-pc-windows-msvc" }, + os: { tag: "windows-latest", target: "x86_64-pc-windows-msvc" }, + ] + runs-on: ${{ matrix.arrays.os.tag }} + steps: + - name: Checkout Repo + uses: actions/checkout@v4 + with: + lfs: true + - name: Install latest + uses: actions-rs/toolchain@v1 + with: + target: ${{ matrix.arrays.os.target }} + toolchain: stable + default: true + - name: Cargo Build + run: cargo build --release + - name: Upload + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.arrays.os.target }} + path: target/release/armatak.dll + if-no-files-found: error + retention-days: 30 + package: + needs: build_extension + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + + - uses: actions/download-artifact@v2 + with: + name: x86_64-pc-windows-msvc + - run: mv ./armatak.dll ./armatak_x64.dll + - uses: actions/download-artifact@v2 + with: + name: i686-pc-windows-msvc + - name: Setup HEMTT + uses: arma-actions/hemtt@v1 + - name: Build + run: hemtt release + - name: Extract Zipped Mod + run: unzip releases/armatak-latest.zip -d releases + - uses: arma-actions/workshop-upload@v1 + with: + appId: '107410' + itemId: ${{ secrets.STEAM_WORKSHOP_ITEM_ID }} + contentPath: releases/@armatak + changelog: 'Update' + env: + STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }} + STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/publish_early.yaml b/.github/workflows/publish_early.yaml deleted file mode 100644 index d8ff40c..0000000 --- a/.github/workflows/publish_early.yaml +++ /dev/null @@ -1,63 +0,0 @@ -name: Publish_Beta - -on: - push: - branches: [ main ] - -jobs: - build_extension: - strategy: - matrix: - arrays: [ - os: { tag: "windows-latest", target: "i686-pc-windows-msvc" }, - os: { tag: "windows-latest", target: "x86_64-pc-windows-msvc" }, - ] - runs-on: ${{ matrix.arrays.os.tag }} - steps: - - name: Checkout Repo - uses: actions/checkout@v4 - with: - lfs: true - - name: Install latest - uses: actions-rs/toolchain@v1 - with: - target: ${{ matrix.arrays.os.target }} - toolchain: stable - default: true - - name: Cargo Build - run: cargo build --release - - name: Upload - uses: actions/upload-artifact@v2 - with: - name: ${{ matrix.arrays.os.target }} - path: target/release/armatak.dll - if-no-files-found: error - retention-days: 30 - package: - needs: build_extension - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - - uses: actions/download-artifact@v2 - with: - name: x86_64-pc-windows-msvc - - run: mv ./armatak.dll ./armatak_x64.dll - - uses: actions/download-artifact@v2 - with: - name: i686-pc-windows-msvc - - name: Setup HEMTT - uses: arma-actions/hemtt@v1 - - name: Build - run: hemtt release - - name: Extract Zipped Mod - run: unzip releases/armatak-latest.zip -d releases - - uses: arma-actions/workshop-upload@v1 - with: - appId: '107410' - itemId: ${{ secrets.STEAM_WORKSHOP_ITEM_ID }} - contentPath: releases/@armatak - changelog: 'Update' - env: - STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }} - STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }} \ No newline at end of file